From f0e9ea0069b6348d7090f82d2d95e647990b2bbd Mon Sep 17 00:00:00 2001 From: eliasfernandez Date: Tue, 8 Feb 2022 13:40:04 +0100 Subject: [PATCH] fixed deployment target not getting updated --- CMakeLists.txt | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bc9a364..11aae02d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,16 +47,16 @@ if (MSVC) endif () endif () -if(APPLE) -# message("-- try to install eigen3 if not installed already") -# execute_process(COMMAND brew install eigen) -# message("----------------") - message("-- Building for architecture ${CMAKE_OSX_ARCHITECTURES}") - set(_msg "Checking which MACOSX_DEPLOYMENT_TARGET to use") - message(STATUS "${_msg}") - set(MACOSX_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) - message(STATUS "${_msg} - ${MACOSX_DEPLOYMENT_TARGET}") -endif() +#if(APPLE) +## message("-- try to install eigen3 if not installed already") +## execute_process(COMMAND brew install eigen) +## message("----------------") +# message("-- Building for architecture ${CMAKE_OSX_ARCHITECTURES}") +# set(_msg "Checking which MACOSX_DEPLOYMENT_TARGET to use") +# message(STATUS "${_msg}") +# set(MACOSX_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET}) +# message(STATUS "${_msg} - ${MACOSX_DEPLOYMENT_TARGET}") +#endif() # Necessary for certain MacOX versions to find homebrew OpenMP if (APPLE AND NOT SKIP_OPENMP) @@ -67,12 +67,24 @@ if (APPLE AND NOT SKIP_OPENMP) execute_process(COMMAND conda list openmp OUTPUT_VARIABLE CONDA_OUTPUT) string(FIND ${CONDA_OUTPUT} "llvm-openmp" OPENMP_INSTALLED) if(${CMAKE_OSX_ARCHITECTURES} STREQUAL "arm64") + set(ENV{CMAKE_OSX_DEPLOYMENT_TARGET} 12.0) + message(STATUS "Building for architecture ${CMAKE_OSX_ARCHITECTURES}") + set(_msg "Checking which MACOSX_DEPLOYMENT_TARGET to use") + message(STATUS "${_msg}") + set(MACOSX_DEPLOYMENT_TARGET $ENV{CMAKE_OSX_DEPLOYMENT_TARGET}) + message(STATUS "${_msg} - ${MACOSX_DEPLOYMENT_TARGET}") if(${OPENMP_INSTALLED} EQUAL -1) set(OPENMP_URL "https://anaconda.org/conda-forge/llvm-openmp/11.1.0/download/osx-arm64/llvm-openmp-11.1.0-hf3c4609_1.tar.bz2") message(STATUS "Installing OpenMP on MACOSX arm64 from ${OPENMP_URL}") execute_process(COMMAND conda install ${OPENMP_URL}) endif() else() + set(ENV{CMAKE_OSX_DEPLOYMENT_TARGET} 10.13) + message(STATUS "Building for architecture ${CMAKE_OSX_ARCHITECTURES}") + set(_msg "Checking which MACOSX_DEPLOYMENT_TARGET to use") + message(STATUS "${_msg}") + set(MACOSX_DEPLOYMENT_TARGET $ENV{CMAKE_OSX_DEPLOYMENT_TARGET}) + message(STATUS "${_msg} - ${MACOSX_DEPLOYMENT_TARGET}") if(${OPENMP_INSTALLED} EQUAL -1) set(OPENMP_URL "https://anaconda.org/conda-forge/llvm-openmp/11.1.0/download/osx-64/llvm-openmp-11.1.0-hda6cdc1_1.tar.bz2") message(STATUS "Installing OpenMP on MACOSX arm64 from ${OPENMP_URL}")