[Bf-blender-cvs] [b5982f7] master: CMake: attempt to resolve OSX+clang failing with OpenMP

Campbell Barton noreply at git.blender.org
Sat Jun 28 22:20:06 CEST 2014


Commit: b5982f71306c44b0abdce3f2be69c0c586164b79
Author: Campbell Barton
Date:   Sun Jun 29 06:18:52 2014 +1000
https://developer.blender.org/rBb5982f71306c44b0abdce3f2be69c0c586164b79

CMake: attempt to resolve OSX+clang failing with OpenMP

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a95d66d..19d457b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1891,11 +1891,11 @@ elseif(APPLE)
 		set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "C compiler flags for OpenMP parallization" FORCE)
 		set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "C++ compiler flags for OpenMP parallization" FORCE)
 		include_directories(${LIBDIR}/openmp/include)
-		LINK_DIRECTORIES(${LIBDIR}/openmp/lib)
+		link_directories(${LIBDIR}/openmp/lib)
+		# XXX, BAD PRACTICE, DON'T DO THIS!!!
 		execute_process(COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES} ${LIBDIR}/openmp/lib/libiomp5.dylib ${CMAKE_BINARY_DIR}/bin/libiomp5.dylib) # for intermediate binaries, lib id is @loader_path
 	else()
-		set(OpenMP_C_FLAGS "" CACHE STRING "C compiler flags for OpenMP parallization" FORCE) # unset
-		set(OpenMP_CXX_FLAGS "" CACHE STRING "C++ compiler flags for OpenMP parallization" FORCE) # unset
+		set(WITH_OPENMP OFF)
 	endif()
 
 	set(EXETYPE MACOSX_BUNDLE)




More information about the Bf-blender-cvs mailing list