diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-02-15 01:57:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-15 02:40:41 +0300 |
| commit | 1135c2cd17661c1f06647af35ccb6ff6a235b5d1 (patch) | |
| tree | fe3a4f764a539fc3c7539c10e5341190b74fcfd5 /build_files | |
| parent | b1f40955d9a9c205581bd8fff3ed04320dbe95da (diff) | |
Cleanup: CMake formatting
Diffstat (limited to 'build_files')
5 files changed, 8 insertions, 8 deletions
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}") |