diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-06-19 00:24:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-06-19 00:32:21 +0300 |
commit | dfe2ca26f714769158093a3a9f2ee1897194fe2a (patch) | |
tree | e8133764079836844097b6ee622e286c06f12d4a /build_files/build_environment | |
parent | 82afc58f91629ddfefbd1f8fe059343577837294 (diff) |
Cleanup: style, indentation
Diffstat (limited to 'build_files/build_environment')
-rw-r--r-- | build_files/build_environment/cmake/blosc.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/faad.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/ffi.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/ssl.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/tbb.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 | ||||
-rw-r--r-- | build_files/build_environment/cmake/zlib.cmake | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake index c7f3cbb8dfa..4e2ae3edde2 100644 --- a/build_files/build_environment/cmake/blosc.cmake +++ b/build_files/build_environment/cmake/blosc.cmake @@ -58,7 +58,7 @@ if(WIN32) ) endif() -if (WIN32) +if(WIN32) if(BUILD_MODE STREQUAL Release) ExternalProject_Add_Step(external_blosc after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib diff --git a/build_files/build_environment/cmake/faad.cmake b/build_files/build_environment/cmake/faad.cmake index 0746fbdab71..15934cc1879 100644 --- a/build_files/build_environment/cmake/faad.cmake +++ b/build_files/build_environment/cmake/faad.cmake @@ -18,7 +18,7 @@ set(FAAD_EXTRA_ARGS) -if (WIN32) +if(WIN32) set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h) else() set(FAAD_EXTRA_CONFIGURE echo .) diff --git a/build_files/build_environment/cmake/ffi.cmake b/build_files/build_environment/cmake/ffi.cmake index aec9f5bc3b3..73894f7478c 100644 --- a/build_files/build_environment/cmake/ffi.cmake +++ b/build_files/build_environment/cmake/ffi.cmake @@ -32,7 +32,7 @@ ExternalProject_Add(external_ffi INSTALL_DIR ${LIBDIR}/ffi ) -if (UNIX AND NOT APPLE) +if(UNIX AND NOT APPLE) ExternalProject_Add_Step(external_ffi after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/ffi/lib/libffi.a ${LIBDIR}/ffi/lib/libffi_pic.a DEPENDEES install diff --git a/build_files/build_environment/cmake/ssl.cmake b/build_files/build_environment/cmake/ssl.cmake index 3ee59aa9c04..6d81c6c9a26 100644 --- a/build_files/build_environment/cmake/ssl.cmake +++ b/build_files/build_environment/cmake/ssl.cmake @@ -19,7 +19,7 @@ set(SSL_CONFIGURE_COMMAND ./Configure) set(SSL_PATCH_CMD echo .) -if (APPLE) +if(APPLE) set(SSL_OS_COMPILER "blender-darwin-x86_64") else() if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") diff --git a/build_files/build_environment/cmake/tbb.cmake b/build_files/build_environment/cmake/tbb.cmake index 30efaeef8a9..77f061e30d0 100644 --- a/build_files/build_environment/cmake/tbb.cmake +++ b/build_files/build_environment/cmake/tbb.cmake @@ -35,7 +35,7 @@ ExternalProject_Add(external_tbb INSTALL_DIR ${LIBDIR}/tbb ) -if (WIN32) +if(WIN32) if(BUILD_MODE STREQUAL Release) ExternalProject_Add_Step(external_tbb after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 0a3c279f7e2..886dd3a8577 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -46,7 +46,7 @@ set(PTHREADS_URI http://sourceforge.mirrorservice.org/p/pt/pthreads4w/pthreads4w set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653) set(ILMBASE_VERSION 2.3.0) -if (WIN32) +if(WIN32) if(BUILD_MODE STREQUAL Release) set(ILMBASE_VERSION_POSTFIX _s) set(OPENEXR_VERSION_POSTFIX _s) @@ -61,7 +61,7 @@ set(ILMBASE_URI https://github.com/openexr/openexr/releases/download/v${ILMBASE_ set(ILMBASE_HASH 354bf86de3b930ab87ac63619d60c860) set(OPENEXR_VERSION 2.3.0) -if (WIN32) #release 2.3.0 tarball has broken cmake support +if(WIN32) #release 2.3.0 tarball has broken cmake support set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz) set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb) else() diff --git a/build_files/build_environment/cmake/zlib.cmake b/build_files/build_environment/cmake/zlib.cmake index f8594bd037c..2b24a2d6f65 100644 --- a/build_files/build_environment/cmake/zlib.cmake +++ b/build_files/build_environment/cmake/zlib.cmake @@ -25,7 +25,7 @@ ExternalProject_Add(external_zlib INSTALL_DIR ${LIBDIR}/zlib ) -if (WIN32) +if(WIN32) if(BUILD_MODE STREQUAL Release) ExternalProject_Add_Step(external_zlib after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT} |