[Bf-blender-cvs] [dfe2ca26f71] master: Cleanup: style, indentation
Campbell Barton
noreply at git.blender.org
Tue Jun 18 23:32:55 CEST 2019
Commit: dfe2ca26f714769158093a3a9f2ee1897194fe2a
Author: Campbell Barton
Date: Wed Jun 19 07:24:55 2019 +1000
Branches: master
https://developer.blender.org/rBdfe2ca26f714769158093a3a9f2ee1897194fe2a
Cleanup: style, indentation
===================================================================
M CMakeLists.txt
M build_files/build_environment/cmake/blosc.cmake
M build_files/build_environment/cmake/faad.cmake
M build_files/build_environment/cmake/ffi.cmake
M build_files/build_environment/cmake/ssl.cmake
M build_files/build_environment/cmake/tbb.cmake
M build_files/build_environment/cmake/versions.cmake
M build_files/build_environment/cmake/zlib.cmake
M build_files/buildbot/config/blender_linux.cmake
M build_files/cmake/macros.cmake
M build_files/cmake/platform/platform_win32.cmake
M intern/cycles/util/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 314bf520c7d..4dd165b0185 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -740,7 +740,7 @@ endif()
# Auto-enable CUDA dynload if toolkit is not found.
if(NOT WITH_CUDA_DYNLOAD)
find_package(CUDA)
- if (NOT CUDA_FOUND)
+ if(NOT CUDA_FOUND)
message("CUDA toolkit not found, using dynamic runtime loading of libraries instead")
set(WITH_CUDA_DYNLOAD ON)
endif()
@@ -815,7 +815,7 @@ set(PLATFORM_LINKLIBS "")
set(PLATFORM_LINKFLAGS "")
set(PLATFORM_LINKFLAGS_DEBUG "")
-if (NOT CMAKE_BUILD_TYPE MATCHES "Release")
+if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
if(WITH_COMPILER_ASAN)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMPILER_ASAN_CFLAGS}")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CFLAGS}")
@@ -965,9 +965,9 @@ if(MSVC)
# for some reason this fails on msvc
add_definitions(-D__LITTLE_ENDIAN__)
-# OSX-Note: as we do cross-compiling with specific set architecture,
-# endianess-detection and auto-setting is counterproductive
-# so we just set endianness according CMAKE_OSX_ARCHITECTURES
+ # OSX-Note: as we do cross-compiling with specific set architecture,
+ # endianess-detection and auto-setting is counterproductive
+ # so we just set endianness according CMAKE_OSX_ARCHITECTURES
elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
add_definitions(-D__LITTLE_ENDIAN__)
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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list