--- CMakeLists.txt.orig 2022-08-20 11:09:24.000000000 -0400 +++ CMakeLists.txt 2022-08-20 11:10:17.000000000 -0400 @@ -16,7 +16,7 @@ endif() if(APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") + #set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") if (MAC_SELF_CONTAINED_BUNDLE) set(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/lib) set(CMAKE_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/include ${CMAKE_SOURCE_DIR}/mac/ExternalPrograms/repository/bin) @@ -425,12 +425,12 @@ ENDIF() # Check for OpenMP -IF(APPLE) +#IF(APPLE) #we need a special search routine for mac, see changes in file CMakeModules/FindOpenMPMac.cmake - FIND_PACKAGE(OpenMPMac) -ELSE() - FIND_PACKAGE(OpenMP) -ENDIF() + #FIND_PACKAGE(OpenMPMac) +#ELSE() + set(OPENMP_FOUND FALSE) +#ENDIF() IF(OPENMP_FOUND) MESSAGE(STATUS "Compiler supports OpenMP. Activating support for it.") ADD_COMPILE_OPTIONS(${OpenMP_CXX_FLAGS}) @@ -559,13 +559,13 @@ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++ -lc++") # setup bundle install prefix IF (NOT MAC_SELF_CONTAINED_BUNDLE) - IF (CMAKE_INSTALL_PREFIX STREQUAL "/opt/local") + IF (MACPORTS) # MacPorts - SET(INSTALL_OSX_BUNDLE_DIR /Applications/MacPorts CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles") - ELSE(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local") + SET(INSTALL_OSX_BUNDLE_DIR @@MACPORTS_APP_PATH@@ CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles") + ELSE(MACPORTS) # fink or other custom system. SET(INSTALL_OSX_BUNDLE_DIR ${CMAKE_INSTALL_PREFIX}/Applications CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles") - ENDIF(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local") + ENDIF(MACPORTS) MESSAGE("*** Will install application bundles in ${INSTALL_OSX_BUNDLE_DIR}, set INSTALL_OSX_BUNDLE_DIR to change the location") ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE) ENDIF (APPLE) @@ -973,4 +973,3 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -