Skip to content

Update for mac #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JMBokhorst wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update for mac #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ set(CMAKE_MODULE_PATH ${DIAGPathology_SOURCE_DIR}/cmakemodules)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

if(NOT WIN32)
set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
set(CMAKE_MACOSX_RPATH TRUE)
set(CMAKE_MACOSX_RPATH TRUE)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" "/opt/homebrew/lib")
ENDIF(NOT WIN32)

set(CMAKE_CXX_STANDARD 17)
Expand Down Expand Up @@ -149,6 +149,7 @@ if(WIN32)
set(CPACK_NSIS_MUI_ICON ${DIAGPathology_SOURCE_DIR}/ASAP/application.ico)
set(CPACK_NSIS_MUI_UNIICON ${DIAGPathology_SOURCE_DIR}/ASAP/application.ico)
elseif(APPLE)
set(CMAKE_FIND_DEBUG_MODE 1)
set(CPACK_GENERATOR "DragNDrop")
set(CPACK_BUNDLE_NAME ASAP)
SET(MACOSX_BUNDLE_ICON_FILE ${DIAGPathology_SOURCE_DIR}/ASAP/application.icns)
Expand Down
2 changes: 1 addition & 1 deletion multiresolutionimageinterface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ if(WRAP_MULTIRESOLUTIONIMAGEINTERFACE_PYTHON)

set_source_files_properties(multiresolutionimageinterface.i PROPERTIES CPLUSPLUS ON)
set_source_files_properties(multiresolutionimageinterface.i PROPERTIES SWIG_FLAGS "-builtin")
set_source_files_properties(multiresolutionimageinterface.i PROPERTIES SWIG_FLAGS "-py3-stable-abi")
# set_source_files_properties(multiresolutionimageinterface.i PROPERTIES SWIG_FLAGS "-py3-stable-abi")

swig_add_library(py_multiresolutionimageinterface LANGUAGE python SOURCES multiresolutionimageinterface.i)
swig_link_libraries(py_multiresolutionimageinterface multiresolutionimageinterface annotation core)
Expand Down