Cleanup: CMake formatting
authorCampbell Barton <ideasman42@gmail.com>
Fri, 14 Feb 2020 22:57:56 +0000 (09:57 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 14 Feb 2020 23:40:41 +0000 (10:40 +1100)
CMakeLists.txt
build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
build_files/buildbot/slave_codesign.cmake
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple_xcode.cmake
tests/gtests/usd/CMakeLists.txt
tests/python/collada/CMakeLists.txt

index 820fea6982cd3a827893b7dbeeaf06a0ef4dda70..ebacd854bb646c17a2b0f1180c9685ce30e32457 100644 (file)
@@ -492,7 +492,8 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
     if(NOT MSVC)
       find_library(COMPILER_ASAN_LIBRARY asan ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
     else()
-      find_library( COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64
+      find_library(
+        COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64
         PATHS
         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows
         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
index fed305057088b676eae5bb88f16d0f730d3af081..731cf514a91f4b420257c03b64b29a317e90d6ed 100644 (file)
@@ -26,8 +26,8 @@ include(FindPackageMessage)
 include(SelectLibraryConfigurations)
 
 
-if( ILMBASE_USE_STATIC_LIBS )
-  set( _ilmbase_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+if(ILMBASE_USE_STATIC_LIBS)
+  set(_ilmbase_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
   if(WIN32)
     set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
   else()
@@ -247,7 +247,7 @@ if(ILMBASE_FOUND)
 endif()
 
 # Restore the original find library ordering
-if( ILMBASE_USE_STATIC_LIBS )
+if(ILMBASE_USE_STATIC_LIBS )
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${_ilmbase_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
 endif()
 
index 2f7cae436eb8ccc0f0153af10d6eaf8f46161207..a0390e3311a1d169b871fce043b4aeb140a568d4 100644 (file)
@@ -230,7 +230,7 @@ if(OPENEXR_FOUND)
 endif()
 
 # Restore the original find library ordering
-if( OPENEXR_USE_STATIC_LIBS )
+if(OPENEXR_USE_STATIC_LIBS )
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${_openexr_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
 endif()
 
index 2c3b58c08c0c9a72f6ea5f21a2923f5a285a31cc..fd2beae11a09313e576c3e7e523554eb235a6e70 100644 (file)
@@ -40,5 +40,5 @@ execute_process(
 )
 
 if(NOT exit_code EQUAL "0")
-    message( FATAL_ERROR "Non-zero exit code of codesign tool")
+    message(FATAL_ERROR "Non-zero exit code of codesign tool")
 endif()
index daf156bc3f2e56ecc15b5196232f9bf74421bb35..2ae641b9eb3838832c587889022ba87c2aec6a46 100644 (file)
@@ -1138,8 +1138,8 @@ endmacro()
 macro(blender_precompile_headers target cpp header)
   if(MSVC)
     # get the name for the pch output file
-    get_filename_component( pchbase ${cpp} NAME_WE )
-    set( pchfinal "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${pchbase}.pch" )
+    get_filename_component(pchbase ${cpp} NAME_WE)
+    set(pchfinal "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${pchbase}.pch")
 
     # mark the cpp as the one outputting the pch
     set_property(SOURCE ${cpp} APPEND PROPERTY OBJECT_OUTPUTS "${pchfinal}")
index b7d43792056ea1690c24e0f3757a24a656c58eba..e42928328f3d715276311cf0dad672560fe42cb2 100644 (file)
@@ -104,7 +104,7 @@ else()
 endif()
 
 if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
-  # force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else ( cmake bug ? )
+  # Force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else (CMake bug?)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
   add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
index fbf29dc121e512c1a68ddcd4107883f025f9f491..df4c865e976c08a85d709d46565b190b44de316c 100644 (file)
@@ -82,8 +82,8 @@ if(WITH_BUILDINFO)
 endif()
 
 # get_cmake_property(_variableNames VARIABLES)
-# list (SORT _variableNames)
-# foreach (_variableName ${_variableNames})
+# list(SORT _variableNames)
+# foreach(_variableName ${_variableNames})
 #     message(STATUS "${_variableName}=${${_variableName}}")
 # endforeach()
 
index 1e09b65b88018f7aeff8a5bffe6a8a91d61fa317..bf22de6b762ed750e2d5ec4bbb3f115941470482 100644 (file)
@@ -50,7 +50,7 @@ endif()
 
 # ------------------------------------------------------------------------------
 # GENERAL PYTHON CORRECTNESS TESTS
-macro (COLLADA_TEST module test_name blend_file)
+macro(COLLADA_TEST module test_name blend_file)
   add_test(
     NAME collada_${module}_${test_name}
     COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS} ${TEST_SRC_DIR}/collada/${module}/${blend_file}