diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake | 6 | ||||
| -rw-r--r-- | build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake | 2 | ||||
| -rw-r--r-- | build_files/buildbot/slave_codesign.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple_xcode.cmake | 2 | ||||
| -rw-r--r-- | tests/gtests/usd/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/python/collada/CMakeLists.txt | 2 |
8 files changed, 13 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 820fea6982c..ebacd854bb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake index fed30505708..731cf514a91 100644 --- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake @@ -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() diff --git a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake index 2f7cae436eb..a0390e3311a 100644 --- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake @@ -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() diff --git a/build_files/buildbot/slave_codesign.cmake b/build_files/buildbot/slave_codesign.cmake index 2c3b58c08c0..fd2beae11a0 100644 --- a/build_files/buildbot/slave_codesign.cmake +++ b/build_files/buildbot/slave_codesign.cmake @@ -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() diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index daf156bc3f2..2ae641b9eb3 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -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}") diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake index b7d43792056..e42928328f3 100644 --- a/build_files/cmake/platform/platform_apple_xcode.cmake +++ b/build_files/cmake/platform/platform_apple_xcode.cmake @@ -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}") diff --git a/tests/gtests/usd/CMakeLists.txt b/tests/gtests/usd/CMakeLists.txt index fbf29dc121e..df4c865e976 100644 --- a/tests/gtests/usd/CMakeLists.txt +++ b/tests/gtests/usd/CMakeLists.txt @@ -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() diff --git a/tests/python/collada/CMakeLists.txt b/tests/python/collada/CMakeLists.txt index 1e09b65b880..bf22de6b762 100644 --- a/tests/python/collada/CMakeLists.txt +++ b/tests/python/collada/CMakeLists.txt @@ -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} |