[Bf-blender-cvs] [35be6d8] master: Cleanup: cmake

Campbell Barton noreply at git.blender.org
Sat Apr 23 16:18:29 CEST 2016


Commit: 35be6d87e84e110714456896deb086576bb02355
Author: Campbell Barton
Date:   Sun Apr 24 00:16:15 2016 +1000
Branches: master
https://developer.blender.org/rB35be6d87e84e110714456896deb086576bb02355

Cleanup: cmake

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

M	CMakeLists.txt
M	build_files/cmake/config/blender_full.cmake
M	source/blender/blenkernel/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a924098..438cb1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,7 +166,7 @@ option_defaults_init(
 )
 
 # customize...
-if (UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE)
 	# some of these libraries are problematic on Linux
 	# disable less important dependencies by default
 	set(_init_CODEC_FFMPEG                   OFF)
@@ -2320,11 +2320,11 @@ elseif(APPLE)
 	# Get rid of eventually clashes, we export some symbols explicite as local
 	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker ${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map")
 
-	# Suppress ranlib "has no symbols" warnings
-	SET(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
-	SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
-	SET(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
-	SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+	# Suppress ranlib "has no symbols" warnings (workaround for T48250)
+	set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
+	set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
+	set(CMAKE_C_ARCHIVE_FINISH   "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+	set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
 endif()
 
 #-----------------------------------------------------------------------------
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index d708f1c..df8ed88 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -69,7 +69,7 @@ elseif(WIN32)
 		set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 		set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
 	endif()
-elseif (APPLE)
+elseif(APPLE)
 	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 7311f33..2bffb16 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -414,7 +414,7 @@ if(WITH_PYTHON)
 	endif()
 
 
-	if (PYTHON_EXECUTABLE)
+	if(PYTHON_EXECUTABLE)
 		get_filename_component(_python_exe_name ${PYTHON_EXECUTABLE} NAME)
 		add_definitions(-DPYTHON_EXECUTABLE_NAME=${_python_exe_name})
 		unset(_python_exe_name)




More information about the Bf-blender-cvs mailing list