diff options
| author | Arto Kitula <arto.kitula@gmail.com> | 2019-02-13 23:34:40 +0300 |
|---|---|---|
| committer | Arto Kitula <arto.kitula@gmail.com> | 2019-02-13 23:34:40 +0300 |
| commit | 11ec57e211f4814bf20933f2f007f77e30ec1ef0 (patch) | |
| tree | beace69d10e7f558b4f3a128eee433ec84e6fb94 | |
| parent | 8365de52bc6cd7d019bfebe7ffc2ddc083cd4493 (diff) | |
fix build on xcode with openmp
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 14 | ||||
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | source/tools | 0 |
4 files changed, 10 insertions, 4 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 2515867d442..2bd9056d1a7 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -394,10 +394,16 @@ if(WITH_OPENMP) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${LIBDIR}/openmp/lib -lomp") # Copy libomp.dylib to allow executables like datatoc to work. - execute_process( - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib - COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib - ) + if(CMAKE_MAKE_PROGRAM MATCHES "xcodebuild") + set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}/bin") + else() + set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}") + endif() + + execute_process( + COMMAND mkdir -p ${OPENMP_DYLIB_AUX_PATH}/Resources/lib + COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${OPENMP_DYLIB_AUX_PATH}/Resources/lib/libomp.dylib + ) endif() endif() diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 4be9fbe61cb1e23baf25c9c379ecd13e22ca189 +Subproject f81ed052157aff3979763cf25840032d11d261b diff --git a/release/scripts/addons b/release/scripts/addons -Subproject f999cc0908333ac0d4b2b203706f3eb640ba54c +Subproject 890a240c550430f9866352d3f1fd8a8c34840c4 diff --git a/source/tools b/source/tools -Subproject 83428cbf0a8d7e0bdd7a91c00124381c1db42e7 +Subproject 3f0d91e9249bf35b92ee745e2c45c460c869fb2 |