diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-02-05 01:45:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-05 01:45:16 +0300 |
commit | 7e850ffa733b5b54ba1e873fbf71c78bc95d80ab (patch) | |
tree | b3dcb7be82216b3a4ccb8e7e0f67ebbb7af8ca63 /build_files | |
parent | 94cf74afbb1329a9ff099e2ebd7f43ed8313f9ec (diff) |
Cleanup: cmake indentation, white-space
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/build_environment/cmake/opencolorio.cmake | 4 | ||||
-rw-r--r-- | build_files/build_environment/cmake/python.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/ssl.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindAudaspace.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindEmbree.cmake | 8 | ||||
-rw-r--r-- | build_files/cmake/Modules/GTest.cmake | 4 | ||||
-rw-r--r-- | build_files/cmake/macros.cmake | 8 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/build_files/build_environment/cmake/opencolorio.cmake b/build_files/build_environment/cmake/opencolorio.cmake index e8b0043edf7..4ad401800d0 100644 --- a/build_files/build_environment/cmake/opencolorio.cmake +++ b/build_files/build_environment/cmake/opencolorio.cmake @@ -32,8 +32,8 @@ set(OPENCOLORIO_EXTRA_ARGS if(APPLE AND NOT("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")) set(OPENCOLORIO_EXTRA_ARGS - ${OPENCOLORIO_EXTRA_ARGS} - -DOCIO_USE_SSE=OFF + ${OPENCOLORIO_EXTRA_ARGS} + -DOCIO_USE_SSE=OFF ) endif() diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake index bfb318f9939..dfb2437d3cb 100644 --- a/build_files/build_environment/cmake/python.cmake +++ b/build_files/build_environment/cmake/python.cmake @@ -79,7 +79,7 @@ else() set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV}) set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python) set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff) - endif() + endif() set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl") set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include") diff --git a/build_files/build_environment/cmake/ssl.cmake b/build_files/build_environment/cmake/ssl.cmake index e1c168817f4..e6741ebb385 100644 --- a/build_files/build_environment/cmake/ssl.cmake +++ b/build_files/build_environment/cmake/ssl.cmake @@ -20,7 +20,7 @@ set(SSL_CONFIGURE_COMMAND ./Configure) set(SSL_PATCH_CMD echo .) if(APPLE) - set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}") + set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}") else() if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 8d3793ef242..98558721cb3 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -265,7 +265,7 @@ set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v${PUGIXML_VERSION}.tar. set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd) set(FLEXBISON_VERSION 2.5.5) -set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip) +set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-2.5.5.zip) set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce) # Libraries to keep Python modules static on Linux. @@ -309,7 +309,7 @@ set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar. set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3) set(MESA_VERSION 18.3.1) -set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz) +set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz) set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be) set(NASM_VERSION 2.15.02) diff --git a/build_files/cmake/Modules/FindAudaspace.cmake b/build_files/cmake/Modules/FindAudaspace.cmake index 07ce2ba33d0..d4a68461d32 100644 --- a/build_files/cmake/Modules/FindAudaspace.cmake +++ b/build_files/cmake/Modules/FindAudaspace.cmake @@ -19,7 +19,7 @@ #============================================================================= IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "") - SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR}) + SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR}) ENDIF() SET(_audaspace_SEARCH_DIRS diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake index 0716f47ca52..af545cee00c 100644 --- a/build_files/cmake/Modules/FindEmbree.cmake +++ b/build_files/cmake/Modules/FindEmbree.cmake @@ -59,14 +59,14 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS}) PATH_SUFFIXES lib64 lib ) - IF (NOT EMBREE_${UPPERCOMPONENT}_LIBRARY) - IF (EMBREE_EMBREE3_LIBRARY) + IF(NOT EMBREE_${UPPERCOMPONENT}_LIBRARY) + IF(EMBREE_EMBREE3_LIBRARY) # If we can't find all the static libraries, try to fall back to the shared library if found. # This allows building with a shared embree library SET(_embree_LIBRARIES ${EMBREE_EMBREE3_LIBRARY}) BREAK() - ENDIF () - ENDIF () + ENDIF() + ENDIF() LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}") ENDFOREACH() diff --git a/build_files/cmake/Modules/GTest.cmake b/build_files/cmake/Modules/GTest.cmake index d32e49d2145..4faa47452b1 100644 --- a/build_files/cmake/Modules/GTest.cmake +++ b/build_files/cmake/Modules/GTest.cmake @@ -272,7 +272,7 @@ cmake_policy(SET CMP0057 NEW) # if IN_LIST #------------------------------------------------------------------------------ function(gtest_add_tests) - if (ARGC LESS 1) + if(ARGC LESS 1) message(FATAL_ERROR "No arguments supplied to gtest_add_tests()") endif() @@ -298,7 +298,7 @@ function(gtest_add_tests) set(autoAddSources YES) else() # Non-keyword syntax, convert to keyword form - if (ARGC LESS 3) + if(ARGC LESS 3) message(FATAL_ERROR "gtest_add_tests() without keyword options requires at least 3 arguments") endif() set(ARGS_TARGET "${ARGV0}") diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index d1f51b99c67..aebcd25e3b6 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -389,7 +389,7 @@ function(blender_add_lib endfunction() function(blender_add_test_suite) - if (ARGC LESS 1) + if(ARGC LESS 1) message(FATAL_ERROR "No arguments supplied to blender_add_test_suite()") endif() @@ -1209,9 +1209,9 @@ function(find_python_package site-packages dist-packages vendor-packages - NO_DEFAULT_PATH - DOC - "Path to python site-packages or dist-packages containing '${package}' module" + NO_DEFAULT_PATH + DOC + "Path to python site-packages or dist-packages containing '${package}' module" ) mark_as_advanced(PYTHON_${_upper_package}_PATH) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index a2448829206..7ded075e8e3 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -353,7 +353,7 @@ endif() if(WITH_PUGIXML) find_package_wrapper(PugiXML) - if (NOT PUGIXML_FOUND) + if(NOT PUGIXML_FOUND) set(WITH_PUGIXML OFF) message(STATUS "PugiXML not found, disabling WITH_PUGIXML") endif() |