[Bf-blender-cvs] [11ec57e211f] master: fix build on xcode with openmp

[Arto Kitula]

Commit: 11ec57e211f4814bf20933f2f007f77e30ec1ef0
Author: Arto Kitula
Date:   Wed Feb 13 22:34:40 2019 +0200
Branches: master
https://developer.blender.org/rB11ec57e211f4814bf20933f2f007f77e30ec1ef0

fix build on xcode with openmp

===================================================================

M	build_files/cmake/platform/platform_apple.cmake
M	release/datafiles/locale
M	release/scripts/addons
M	source/tools

===================================================================

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
index 4be9fbe61cb..f81ed052157 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 4be9fbe61cb1e23baf25c9c379ecd13e22ca1898
+Subproject commit f81ed052157aff3979763cf25840032d11d261b6
diff --git a/release/scripts/addons b/release/scripts/addons
index f999cc09083..890a240c550 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f999cc0908333ac0d4b2b203706f3eb640ba54c9
+Subproject commit 890a240c550430f9866352d3f1fd8a8c34840c4b
diff --git a/source/tools b/source/tools
index 83428cbf0a8..3f0d91e9249 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 83428cbf0a8d7e0bdd7a91c00124381c1db42e70
+Subproject commit 3f0d91e9249bf35b92ee745e2c45c460c869fb25