diff --git a/CMakeLists.txt b/CMakeLists.txt index 26508fc..51784c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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) diff --git a/multiresolutionimageinterface/CMakeLists.txt b/multiresolutionimageinterface/CMakeLists.txt index a8eb934..5592774 100644 --- a/multiresolutionimageinterface/CMakeLists.txt +++ b/multiresolutionimageinterface/CMakeLists.txt @@ -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)