[Bf-blender-cvs] [312075e6883] blender-v2.81-release: CMake: add missing headers, use space before comments

Campbell Barton noreply at git.blender.org
Mon Oct 28 15:38:25 CET 2019 

Commit: 312075e6883986fe2d1861811c7255b8898ab2cc
Author: Campbell Barton
Date:   Tue Oct 29 01:32:33 2019 +1100
Branches: blender-v2.81-release
https://developer.blender.org/rB312075e6883986fe2d1861811c7255b8898ab2cc

CMake: add missing headers, use space before comments

===================================================================

M	CMakeLists.txt
M	build_files/build_environment/CMakeLists.txt
M	build_files/build_environment/cmake/blosc.cmake
M	build_files/build_environment/cmake/lcms.cmake
M	build_files/build_environment/cmake/opencolorio.cmake
M	build_files/build_environment/cmake/openexr.cmake
M	build_files/build_environment/cmake/openjpeg.cmake
M	build_files/build_environment/cmake/options.cmake
M	build_files/build_environment/cmake/sndfile.cmake
M	build_files/build_environment/cmake/tinyxml.cmake
M	build_files/build_environment/cmake/versions.cmake
M	build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
M	build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
M	build_files/cmake/Modules/FindIcuLinux.cmake
M	build_files/cmake/Modules/FindPythonLibsUnix.cmake
M	build_files/cmake/cmake_consistency_check.py
M	build_files/cmake/macros.cmake
M	build_files/cmake/platform/platform_apple.cmake
M	build_files/cmake/platform/platform_win32.cmake
M	extern/CMakeLists.txt
M	intern/cycles/CMakeLists.txt
M	intern/cycles/blender/CMakeLists.txt
M	intern/cycles/kernel/CMakeLists.txt
M	intern/cycles/util/CMakeLists.txt
M	intern/ghost/CMakeLists.txt
M	intern/guardedalloc/CMakeLists.txt
M	intern/opensubdiv/CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/compositor/CMakeLists.txt
M	source/blender/editors/datafiles/CMakeLists.txt
M	source/blender/editors/util/CMakeLists.txt
M	source/blender/makesdna/intern/CMakeLists.txt
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/windowmanager/CMakeLists.txt
M	tests/python/CMakeLists.txt
M	tests/python/collada/CMakeLists.txt
M	tests/python/view_layer/CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba051b82671..e468ae36906 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -847,7 +847,7 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
 endif()
 
 #-----------------------------------------------------------------------------
-#Platform specifics
+# Platform specifics
 
 if(WITH_X11)
   find_package(X11 REQUIRED)
@@ -1579,7 +1579,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 
   if(MSVC_VERSION GREATER_EQUAL 1911)
     # see https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c5038?view=vs-2017
-    set(_WARNINGS "${_WARNINGS} /w35038") #order of initialisation in c++ constructors
+    set(_WARNINGS "${_WARNINGS} /w35038") # order of initialization in c++ constructors
   endif()
 
   string(REPLACE ";" " " _WARNINGS "${_WARNINGS}")
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index c7d8de22890..cdfa18ff4ff 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -114,7 +114,7 @@ if(WIN32)
   include(cmake/tinyxml.cmake)
   include(cmake/yamlcpp.cmake)
   # LCMS is an OCIO dep, but only if you build the apps, leaving it here for convenience
-  #include(cmake/lcms.cmake)
+  # include(cmake/lcms.cmake)
 
 endif()
 
diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake
index 4e2ae3edde2..221fa9d58bf 100644
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -30,8 +30,8 @@ set(BLOSC_EXTRA_ARGS
 )
 
 if(WIN32)
-  #prevent blosc from including it's own local copy of zlib in the object file
-  #and cause linker errors with everybody else
+  # Prevent blosc from including it's own local copy of zlib in the object file
+  # and cause linker errors with everybody else.
   set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
     -DPREFER_EXTERNAL_ZLIB=ON
   )
diff --git a/build_files/build_environment/cmake/lcms.cmake b/build_files/build_environment/cmake/lcms.cmake
index 7e8f955aa58..c7019bc645e 100644
--- a/build_files/build_environment/cmake/lcms.cmake
+++ b/build_files/build_environment/cmake/lcms.cmake
@@ -24,7 +24,7 @@ ExternalProject_Add(external_lcms
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH MD5=${LCMS_HASH}
   PREFIX ${BUILD_DIR}/lcms
-  #patch taken from ocio
+  # Patch taken from ocio.
   PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt ${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS} ${LCMS_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/lcms
diff --git a/build_files/build_environment/cmake/opencolorio.cmake b/build_files/build_environment/cmake/opencolorio.cmake
index 0f6b8fee673..1260a1217dd 100644
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -50,7 +50,7 @@ if(WIN32)
     -DUSE_EXTERNAL_LCMS=ON
     -DINC_1=${LIBDIR}/tinyxml/include
     -DINC_2=${LIBDIR}/yamlcpp/include
-    #lie because ocio cmake is demanding boost even though it is not needed
+    # Lie because ocio cmake is demanding boost even though it is not needed.
     -DYAML_CPP_VERSION=0.5.0
   )
 else()
diff --git a/build_files/build_environment/cmake/openexr.cmake b/build_files/build_environment/cmake/openexr.cmake
index 7ac85ab9bdf..39533a94cd9 100644
--- a/build_files/build_environment/cmake/openexr.cmake
+++ b/build_files/build_environment/cmake/openexr.cmake
@@ -44,7 +44,7 @@ if(WIN32)
 
   ExternalProject_Add_Step(external_openexr after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
-    #libs have moved between versions, just duplicate it for now.
+    # Libs have moved between versions, just duplicate it for now.
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${LIBDIR}/ilmbase/lib
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
     DEPENDEES install
diff --git a/build_files/build_environment/cmake/openjpeg.cmake b/build_files/build_environment/cmake/openjpeg.cmake
index 8cc52142ee0..9973a9d9cee 100644
--- a/build_files/build_environment/cmake/openjpeg.cmake
+++ b/build_files/build_environment/cmake/openjpeg.cmake
@@ -38,7 +38,7 @@ ExternalProject_Add(external_openjpeg
   INSTALL_DIR ${LIBDIR}/openjpeg
 )
 
-#on windows ffmpeg wants a mingw build, while oiio needs a msvc build
+# On windows ffmpeg wants a mingw build, while oiio needs a msvc build.
 if(MSVC)
   set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
   ExternalProject_Add(external_openjpeg_msvc
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index ded13977c05..52b850a021f 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -190,7 +190,7 @@ set(DEFAULT_CMAKE_FLAGS
 )
 
 if(WIN32)
-  #we need both flavors to build the thumbnail dlls
+  # We need both flavors to build the thumbnail dlls
   if(MSVC12)
     set(GENERATOR_32 "Visual Studio 12 2013")
     set(GENERATOR_64 "Visual Studio 12 2013 Win64")
diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake
index 87d421a3764..bafd8fe2ac6 100644
--- a/build_files/build_environment/cmake/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -21,7 +21,7 @@ set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR
 
 if(WIN32)
   set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
-  #shared for windows because static libs will drag in a libgcc dependency.
+  # Shared for windows because static libs will drag in a libgcc dependency.
   set(SNDFILE_OPTIONS --disable-static --enable-shared )
 else()
   set(SNDFILE_OPTIONS --enable-static --disable-shared )
diff --git a/build_files/build_environment/cmake/tinyxml.cmake b/build_files/build_environment/cmake/tinyxml.cmake
index cbbbb0a0a49..763fd959d24 100644
--- a/build_files/build_environment/cmake/tinyxml.cmake
+++ b/build_files/build_environment/cmake/tinyxml.cmake
@@ -24,7 +24,7 @@ ExternalProject_Add(external_tinyxml
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH MD5=${TINYXML_HASH}
   PREFIX ${BUILD_DIR}/tinyxml
-  #patch taken from ocio
+  # patch taken from ocio
   PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml ${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/tinyxml
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 1c9e5c5a4f6..a261b5fd504 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -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()
@@ -90,17 +90,17 @@ set(ALEMBIC_VERSION 1.7.8)
 set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
 set(ALEMBIC_MD5 d095c2feb5e183b824904db7b63c1d30)
 
-## hash is for 3.1.2
+# hash is for 3.1.2
 set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c)
 set(GLFW_URI https://github.com/glfw/glfw/archive/${GLFW_GIT_UID}.zip)
 set(GLFW_HASH 20cacb1613da7eeb092f3ac4f6b2b3d0)
 
-#latest uid in git as of 2016-04-01
+# latest uid in git as of 2016-04-01
 set(CLEW_GIT_UID 277db43f6cafe8b27c6f1055f69dc67da4aeb299)
 set(CLEW_URI https://github.com/OpenCLWrangler/clew/archive/${CLEW_GIT_UID}.zip)
 set(CLEW_HASH 2c699d10ed78362e71f56fae2a4c5f98)
 
-#latest uid in git as of 2016-04-01
+# latest uid in git as of 2016-04-01
 set(CUEW_GIT_UID 1744972026de9cf27c8a7dc39cf39cd83d5f922f)
 set(CUEW_URI https://github.com/CudaWrangler/cuew/archive/${CUEW_GIT_UID}.zip)
 set(CUEW_HASH 86760d62978ebfd96cd93f5aa1abaf4a)
@@ -203,7 +203,7 @@ set(XVIDCORE_VERSION 1.3.5)
 set(XVIDCORE_URI http://downloads.xvid.org/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
 set(XVIDCORE_HASH 165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0)
 
-#this has to be in sync with the version in blenders /extern folder
+# This has to be in sync with the version in blenders /extern folder.
 set(OPENJPEG_VERSION 2.3.0)
 set(OPENJPEG_SHORT_VERSION 2.3)
 # Use slightly newer commit after release which includes a cmake fix
@@ -234,9 +234,9 @@ set(SNDFILE_VERSION 1.0.28)
 set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz)
 set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c)
 
-#set(HIDAPI_VERSION 0.8.0-rc1)
-#set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz)
-#set(HIDAPI_HASH 069f9dd746edc37b6b6d0e3656f47199)
+# set(HIDAPI_VERSION 0.8.0-rc1)
+# set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz)
+# set(HIDAPI_HASH 069f9dd746edc37b6b6d0e3656f47199)
 
 set(HIDAPI_UID 89a6c75dc6f45ecabd4ddfbd2bf5ba6ad8ba38b5)
 set(HIDAPI_URI https://github.com/TheOnlyJoey/hidapi/archive/${HIDAPI_UID}.zip)
diff --git a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
index 10075d71484..62ccc17d014 100644
--- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
@@ -192,11 +192,11 @@ if(ILMBASE_CUSTOM)
   set(IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
   separate_arguments(IlmBase_Libraries)
 else()
-#elseif(${ILMBASE_VERSION} VERSION_LESS "2.1")
+# elseif(${ILMBASE_VERSION} VERSION_LESS "2.1")
   set(IlmBase_Libraries Half Iex Imath IlmThread)
-#else()
-#  string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list