From 1915b5338b4de372733b7a960f563283fb9f391e Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Fri, 1 Mar 2019 10:01:55 +0100 Subject: [PATCH] build_environment: Fixed `make deps` on macOS Two changes: Removed the explicit version for the macOS SDK, recent versions of Xcode have a symlink to the newest SDK. Fixed the build script for OpenMP by removing extra ' marks that install_name_tool took literally and replaced INSTALL_PATH with INSTALL_DIR. --- build_files/build_environment/cmake/openmp.cmake | 4 ++-- build_files/build_environment/cmake/options.cmake | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build_files/build_environment/cmake/openmp.cmake b/build_files/build_environment/cmake/openmp.cmake index d8224020ecf..f9f5a5cfb63 100644 --- a/build_files/build_environment/cmake/openmp.cmake +++ b/build_files/build_environment/cmake/openmp.cmake @@ -23,8 +23,8 @@ ExternalProject_Add(external_openmp URL_HASH MD5=${OPENMP_HASH} PREFIX ${BUILD_DIR}/openmp CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS} - INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id '@executable_path/../Resources/lib/libomp.dylib' runtime/src/libomp.dylib && make install - INSTALL_PATH ${LIBDIR}/openmp + INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install + INSTALL_DIR ${LIBDIR}/openmp ) add_dependencies( diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 20e9750bed6..ac36c891976 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -127,8 +127,7 @@ else() ) set(OSX_ARCHITECTURES x86_64) set(OSX_DEPLOYMENT_TARGET 10.9) - set(OSX_SDK_VERSION 10.13) - set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk) + set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk) set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}") set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++") -- 2.21.0