Cleanup: cmake
authorCampbell Barton <ideasman42@gmail.com>
Sat, 23 Apr 2016 14:16:15 +0000 (00:16 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 23 Apr 2016 14:16:44 +0000 (00:16 +1000)
CMakeLists.txt
build_files/cmake/config/blender_full.cmake
source/blender/blenkernel/CMakeLists.txt

index a924098b85a79b3027f4e5af3487208142a636d8..438cb1cdd9f1f8f40e0737dc19459e6fa89e3f8e 100644 (file)
@@ -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()
 
 #-----------------------------------------------------------------------------
index d708f1ccecfbdd2aa73fe9566cb49c807a8a75a4..df8ed881d960dd9049189dfba6179e3221de0653 100644 (file)
@@ -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)
index 7311f330962717054dd4d63da48f05c87a018d3d..2bffb16e03497863eec686f119803d7df0732dff 100644 (file)
@@ -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)