--- CMakeLists.txt.orig 2017-05-15 08:05:31.000000000 -0700 +++ CMakeLists.txt 2017-07-30 07:35:10.000000000 -0700 @@ -12,7 +12,7 @@ endif(COMMAND cmake_policy) 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) @@ -554,21 +554,21 @@ SET(INSTALL_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/hugin/data) SET(INSTALL_LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/${LOCALEDIR}) -IF (APPLE) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++") - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++ -lc++") +#IF (APPLE) + #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++") + #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 (NOT MAC_SELF_CONTAINED_BUNDLE) + #IF (CMAKE_INSTALL_PREFIX STREQUAL "/opt/local") # 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 /Applications/MacPorts CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles") + #ELSE(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local") # 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") - 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) + #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") + #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) IF (${HUGIN_SHARED} AND UNIX AND NOT APPLE) SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin")