From dfe2ca26f714769158093a3a9f2ee1897194fe2a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 19 Jun 2019 07:24:55 +1000 Subject: Cleanup: style, indentation --- build_files/build_environment/cmake/blosc.cmake | 2 +- build_files/build_environment/cmake/faad.cmake | 2 +- build_files/build_environment/cmake/ffi.cmake | 2 +- build_files/build_environment/cmake/ssl.cmake | 2 +- build_files/build_environment/cmake/tbb.cmake | 2 +- build_files/build_environment/cmake/versions.cmake | 4 +- build_files/build_environment/cmake/zlib.cmake | 2 +- build_files/buildbot/config/blender_linux.cmake | 230 ++++++++++----------- build_files/cmake/macros.cmake | 4 +- build_files/cmake/platform/platform_win32.cmake | 4 +- 10 files changed, 127 insertions(+), 127 deletions(-) (limited to 'build_files') 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} diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 52d4b864576..8b2dcc556f3 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -51,131 +51,131 @@ set(WITH_PYTHON_INSTALL_REQUESTS ON CACHE BOOL "" FORCE) # ######## Release environment specific settings ######## -if (NOT ${GLIBC} STREQUAL "2.24") - -# All the hardcoded library paths and such - -# LLVM libraries -set(LLVM_VERSION "3.4" CACHE STRING "" FORCE) -set(LLVM_ROOT_DIR "/opt/lib/llvm-${LLVM_VERSION}" CACHE STRING "" FORCE) -set(LLVM_STATIC ON CACHE BOOL "" FORCE) - -# BOOST libraries -set(BOOST_ROOT "/opt/lib/boost" CACHE STRING "" FORCE) -set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) - -# FFmpeg libraries -set(FFMPEG "/opt/lib/ffmpeg" CACHE STRING "" FORCE) -set(FFMPEG_LIBRARIES - avdevice avformat avcodec avutil avfilter swscale swresample - /usr/lib${MULTILIB}/libxvidcore.a - /usr/lib${MULTILIB}/libx264.a - /usr/lib${MULTILIB}/libmp3lame.a - /usr/lib${MULTILIB}/libvpx.a - /usr/lib${MULTILIB}/libvorbis.a - /usr/lib${MULTILIB}/libogg.a - /usr/lib${MULTILIB}/libvorbisenc.a - /usr/lib${MULTILIB}/libtheora.a - /usr/lib${MULTILIB}/libschroedinger-1.0.a - /usr/lib${MULTILIB}/liborc-0.4.a - CACHE STRING "" FORCE -) - -# SndFile libraries -set(SNDFILE_LIBRARY "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILIB}/libFLAC.a" CACHE STRING "" FORCE) - -# OpenAL libraries -set(OPENAL_ROOT_DIR "/opt/lib/openal" CACHE STRING "" FORCE) -set(OPENAL_INCLUDE_DIR "${OPENAL_ROOT_DIR}/include/AL" CACHE STRING "" FORCE) -set(OPENAL_LIBRARY - ${OPENAL_ROOT_DIR}/lib/libopenal.a - ${OPENAL_ROOT_DIR}/lib/libcommon.a - CACHE STRING "" FORCE -) - -# OpenCollada libraries -set(OPENCOLLADA_UTF_LIBRARY "" CACHE STRING "" FORCE) -set(PCRE_INCLUDE_DIR "/usr/include" CACHE STRING "" FORCE) -set(PCRE_LIBRARY "/usr/lib${MULTILIB}/libpcre.a" CACHE STRING "" FORCE) -set(XML2_INCLUDE_DIR "/usr/include" CACHE STRING "" FORCE) -set(XML2_LIBRARY "/usr/lib${MULTILIB}/libxml2.a" CACHE STRING "" FORCE) - -# OpenColorIO libraries -set(OPENCOLORIO_ROOT_DIR "/opt/lib/ocio" CACHE STRING "" FORCE) -set(OPENCOLORIO_OPENCOLORIO_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libOpenColorIO.a" CACHE STRING "" FORCE) -set(OPENCOLORIO_TINYXML_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libtinyxml.a" CACHE STRING "" FORCE) -set(OPENCOLORIO_YAML-CPP_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.a" CACHE STRING "" FORCE) - -# Freetype -set(FREETYPE_INCLUDE_DIRS "/usr/include/freetype2" CACHE STRING "" FORCE) -set(FREETYPE_LIBRARY "/usr/lib${MULTILIB}/libfreetype.a" CACHE STRING "" FORCE) - -# OpenImageIO -if(GLIBC EQUAL "2.19") - set(OPENIMAGEIO_LIBRARY - /opt/lib/oiio/lib/libOpenImageIO.a - /opt/lib/oiio/lib/libOpenImageIO_Util.a - /usr/lib${MULTILIB}/libwebp.a - /usr/lib${MULTILIB}/liblzma.a - /usr/lib${MULTILIB}/libjbig.a - ${FREETYPE_LIBRARY} +if(NOT ${GLIBC} STREQUAL "2.24") + + # All the hardcoded library paths and such + + # LLVM libraries + set(LLVM_VERSION "3.4" CACHE STRING "" FORCE) + set(LLVM_ROOT_DIR "/opt/lib/llvm-${LLVM_VERSION}" CACHE STRING "" FORCE) + set(LLVM_STATIC ON CACHE BOOL "" FORCE) + + # BOOST libraries + set(BOOST_ROOT "/opt/lib/boost" CACHE STRING "" FORCE) + set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) + + # FFmpeg libraries + set(FFMPEG "/opt/lib/ffmpeg" CACHE STRING "" FORCE) + set(FFMPEG_LIBRARIES + avdevice avformat avcodec avutil avfilter swscale swresample + /usr/lib${MULTILIB}/libxvidcore.a + /usr/lib${MULTILIB}/libx264.a + /usr/lib${MULTILIB}/libmp3lame.a + /usr/lib${MULTILIB}/libvpx.a + /usr/lib${MULTILIB}/libvorbis.a + /usr/lib${MULTILIB}/libogg.a + /usr/lib${MULTILIB}/libvorbisenc.a + /usr/lib${MULTILIB}/libtheora.a + /usr/lib${MULTILIB}/libschroedinger-1.0.a + /usr/lib${MULTILIB}/liborc-0.4.a CACHE STRING "" FORCE ) -endif() -# OpenSubdiv libraries -set(OPENSUBDIV_ROOT_DIR "/opt/lib/opensubdiv" CACHE STRING "" FORCE) -set(OPENSUBDIV_OSDCPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdCPU.a" CACHE STRING "" FORCE) -set(OPENSUBDIV_OSDGPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdGPU.a" CACHE STRING "" FORCE) - -# OpenEXR libraries -set(OPENEXR_ROOT_DIR "/opt/lib/openexr" CACHE STRING "" FORCE) -set(OPENEXR_HALF_LIBRARY "/opt/lib/openexr/lib/libHalf.a" CACHE STRING "" FORCE) -set(OPENEXR_IEX_LIBRARY "/opt/lib/openexr/lib/libIex.a" CACHE STRING "" FORCE) -set(OPENEXR_ILMIMF_LIBRARY "/opt/lib/openexr/lib/libIlmImf.a" CACHE STRING "" FORCE) -set(OPENEXR_ILMTHREAD_LIBRARY "/opt/lib/openexr/lib/libIlmThread.a" CACHE STRING "" FORCE) -set(OPENEXR_IMATH_LIBRARY "/opt/lib/openexr/lib/libImath.a" CACHE STRING "" FORCE) - -# JeMalloc library -set(JEMALLOC_LIBRARY "/opt/lib/jemalloc/lib/libjemalloc.a" CACHE STRING "" FORCE) - -# Space navigation -set(SPACENAV_ROOT_DIR "/opt/lib/libspnav" CACHE STRING "" FORCE) - -# Force some system libraries to be static -set(FFTW3_LIBRARY "/usr/lib${MULTILIB}/libfftw3.a" CACHE STRING "" FORCE) -set(JPEG_LIBRARY "/usr/lib${MULTILIB}/libjpeg.a" CACHE STRING "" FORCE) -set(PNG_LIBRARY "/usr/lib${MULTILIB}/libpng.a" CACHE STRING "" FORCE) -set(TIFF_LIBRARY "/usr/lib${MULTILIB}/libtiff.a" CACHE STRING "" FORCE) -set(ZLIB_LIBRARY "/usr/lib${MULTILIB}/libz.a" CACHE STRING "" FORCE) - -# OpenVDB -set(OPENVDB_LIBRARY - /opt/lib/openvdb/lib/libopenvdb.a - CACHE BOOL "" FORCE -) - -set(BLOSC_LIBRARY - /opt/lib/blosc/lib/libblosc.a - CACHE BOOL "" FORCE -) + # SndFile libraries + set(SNDFILE_LIBRARY "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILIB}/libFLAC.a" CACHE STRING "" FORCE) + + # OpenAL libraries + set(OPENAL_ROOT_DIR "/opt/lib/openal" CACHE STRING "" FORCE) + set(OPENAL_INCLUDE_DIR "${OPENAL_ROOT_DIR}/include/AL" CACHE STRING "" FORCE) + set(OPENAL_LIBRARY + ${OPENAL_ROOT_DIR}/lib/libopenal.a + ${OPENAL_ROOT_DIR}/lib/libcommon.a + CACHE STRING "" FORCE + ) + + # OpenCollada libraries + set(OPENCOLLADA_UTF_LIBRARY "" CACHE STRING "" FORCE) + set(PCRE_INCLUDE_DIR "/usr/include" CACHE STRING "" FORCE) + set(PCRE_LIBRARY "/usr/lib${MULTILIB}/libpcre.a" CACHE STRING "" FORCE) + set(XML2_INCLUDE_DIR "/usr/include" CACHE STRING "" FORCE) + set(XML2_LIBRARY "/usr/lib${MULTILIB}/libxml2.a" CACHE STRING "" FORCE) + + # OpenColorIO libraries + set(OPENCOLORIO_ROOT_DIR "/opt/lib/ocio" CACHE STRING "" FORCE) + set(OPENCOLORIO_OPENCOLORIO_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libOpenColorIO.a" CACHE STRING "" FORCE) + set(OPENCOLORIO_TINYXML_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libtinyxml.a" CACHE STRING "" FORCE) + set(OPENCOLORIO_YAML-CPP_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.a" CACHE STRING "" FORCE) + + # Freetype + set(FREETYPE_INCLUDE_DIRS "/usr/include/freetype2" CACHE STRING "" FORCE) + set(FREETYPE_LIBRARY "/usr/lib${MULTILIB}/libfreetype.a" CACHE STRING "" FORCE) + + # OpenImageIO + if(GLIBC EQUAL "2.19") + set(OPENIMAGEIO_LIBRARY + /opt/lib/oiio/lib/libOpenImageIO.a + /opt/lib/oiio/lib/libOpenImageIO_Util.a + /usr/lib${MULTILIB}/libwebp.a + /usr/lib${MULTILIB}/liblzma.a + /usr/lib${MULTILIB}/libjbig.a + ${FREETYPE_LIBRARY} + CACHE STRING "" FORCE + ) + endif() + + # OpenSubdiv libraries + set(OPENSUBDIV_ROOT_DIR "/opt/lib/opensubdiv" CACHE STRING "" FORCE) + set(OPENSUBDIV_OSDCPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdCPU.a" CACHE STRING "" FORCE) + set(OPENSUBDIV_OSDGPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdGPU.a" CACHE STRING "" FORCE) + + # OpenEXR libraries + set(OPENEXR_ROOT_DIR "/opt/lib/openexr" CACHE STRING "" FORCE) + set(OPENEXR_HALF_LIBRARY "/opt/lib/openexr/lib/libHalf.a" CACHE STRING "" FORCE) + set(OPENEXR_IEX_LIBRARY "/opt/lib/openexr/lib/libIex.a" CACHE STRING "" FORCE) + set(OPENEXR_ILMIMF_LIBRARY "/opt/lib/openexr/lib/libIlmImf.a" CACHE STRING "" FORCE) + set(OPENEXR_ILMTHREAD_LIBRARY "/opt/lib/openexr/lib/libIlmThread.a" CACHE STRING "" FORCE) + set(OPENEXR_IMATH_LIBRARY "/opt/lib/openexr/lib/libImath.a" CACHE STRING "" FORCE) + + # JeMalloc library + set(JEMALLOC_LIBRARY "/opt/lib/jemalloc/lib/libjemalloc.a" CACHE STRING "" FORCE) + + # Space navigation + set(SPACENAV_ROOT_DIR "/opt/lib/libspnav" CACHE STRING "" FORCE) + + # Force some system libraries to be static + set(FFTW3_LIBRARY "/usr/lib${MULTILIB}/libfftw3.a" CACHE STRING "" FORCE) + set(JPEG_LIBRARY "/usr/lib${MULTILIB}/libjpeg.a" CACHE STRING "" FORCE) + set(PNG_LIBRARY "/usr/lib${MULTILIB}/libpng.a" CACHE STRING "" FORCE) + set(TIFF_LIBRARY "/usr/lib${MULTILIB}/libtiff.a" CACHE STRING "" FORCE) + set(ZLIB_LIBRARY "/usr/lib${MULTILIB}/libz.a" CACHE STRING "" FORCE) + + # OpenVDB + set(OPENVDB_LIBRARY + /opt/lib/openvdb/lib/libopenvdb.a + CACHE BOOL "" FORCE + ) + + set(BLOSC_LIBRARY + /opt/lib/blosc/lib/libblosc.a + CACHE BOOL "" FORCE + ) else() -set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}" CACHE BOOL "" FORCE) + set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}" CACHE BOOL "" FORCE) -# TODO(sergey): Remove once Python is oficially bumped to 3.7. -set(PYTHON_VERSION 3.7 CACHE BOOL "" FORCE) + # TODO(sergey): Remove once Python is oficially bumped to 3.7. + set(PYTHON_VERSION 3.7 CACHE BOOL "" FORCE) -# Platform specific configuration, to ensure static linking against everything. + # Platform specific configuration, to ensure static linking against everything. -set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) + set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) -# We need to link OpenCOLLADA against PCRE library. Even though it is not installed -# on /usr, we do not really care -- all we care is PCRE_FOUND be TRUE and its -# library pointing to a valid one. -set(PCRE_INCLUDE_DIR "/usr/include" CACHE STRING "" FORCE) -set(PCRE_LIBRARY "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE) + # We need to link OpenCOLLADA against PCRE library. Even though it is not installed + # on /usr, we do not really care -- all we care is PCRE_FOUND be TRUE and its + # library pointing to a valid one. + set(PCRE_INCLUDE_DIR "/usr/include" CACHE STRING "" FORCE) + set(PCRE_LIBRARY "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE) endif() diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 4095b7bc815..e6ae3b5efdb 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -251,7 +251,7 @@ function(blender_add_lib__impl add_library(${name} ${sources}) - if (NOT "${library_deps}" STREQUAL "") + if(NOT "${library_deps}" STREQUAL "") target_link_libraries(${name} INTERFACE "${library_deps}") endif() @@ -1240,7 +1240,7 @@ macro(WINDOWS_SIGN_TARGET target) endmacro() macro(blender_precompile_headers target cpp header) - if (MSVC) + if(MSVC) # get the name for the pch output file get_filename_component( pchbase ${cpp} NAME_WE ) set( pchfinal "${CMAKE_CURRENT_BINARY_DIR}/${pchbase}.pch" ) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index f91f9d8fef0..3fc0d20fb46 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -30,7 +30,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang") set(MSVC_CLANG On) set(VC_TOOLS_DIR $ENV{VCToolsRedistDir} CACHE STRING "Location of the msvc redistributables") set(MSVC_REDIST_DIR ${VC_TOOLS_DIR}) - if (DEFINED MSVC_REDIST_DIR) + if(DEFINED MSVC_REDIST_DIR) file(TO_CMAKE_PATH ${MSVC_REDIST_DIR} MSVC_REDIST_DIR) else() message("Unable to detect the Visual Studio redist directory, copying of the runtime dlls will not work, try running from the visual studio developer prompt.") @@ -643,7 +643,7 @@ if(WITH_CYCLES_EMBREE) endif() endif() -if (WINDOWS_PYTHON_DEBUG) +if(WINDOWS_PYTHON_DEBUG) # Include the system scripts in the blender_python_system_scripts project. FILE(GLOB_RECURSE inFiles "${CMAKE_SOURCE_DIR}/release/scripts/*.*" ) ADD_CUSTOM_TARGET(blender_python_system_scripts SOURCES ${inFiles}) -- cgit v1.2.3