CMake: add missing headers, use space before comments
authorCampbell Barton <ideasman42@gmail.com>
Mon, 28 Oct 2019 14:32:33 +0000 (01:32 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 28 Oct 2019 14:33:44 +0000 (01:33 +1100)
37 files changed:
CMakeLists.txt
build_files/build_environment/CMakeLists.txt
build_files/build_environment/cmake/blosc.cmake
build_files/build_environment/cmake/lcms.cmake
build_files/build_environment/cmake/opencolorio.cmake
build_files/build_environment/cmake/openexr.cmake
build_files/build_environment/cmake/openjpeg.cmake
build_files/build_environment/cmake/options.cmake
build_files/build_environment/cmake/sndfile.cmake
build_files/build_environment/cmake/tinyxml.cmake
build_files/build_environment/cmake/versions.cmake
build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
build_files/cmake/Modules/FindIcuLinux.cmake
build_files/cmake/Modules/FindPythonLibsUnix.cmake
build_files/cmake/cmake_consistency_check.py
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple.cmake
build_files/cmake/platform/platform_win32.cmake
extern/CMakeLists.txt
intern/cycles/CMakeLists.txt
intern/cycles/blender/CMakeLists.txt
intern/cycles/kernel/CMakeLists.txt
intern/cycles/util/CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/guardedalloc/CMakeLists.txt
intern/opensubdiv/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/compositor/CMakeLists.txt
source/blender/editors/datafiles/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/makesdna/intern/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
tests/python/CMakeLists.txt
tests/python/collada/CMakeLists.txt
tests/python/view_layer/CMakeLists.txt

index ba051b8267161233bb8dfbecc1e9065d9a5a9401..e468ae36906739e5a9e9bf50360fee7330b7175a 100644 (file)
@@ -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}")
index c7d8de22890bcaa2e870475ab12f7fd32496f9ad..cdfa18ff4ff401de6b1298967d4da1ea30c3d167 100644 (file)
@@ -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()
 
index 4e2ae3edde2f5241aa1e3c995c558605a98e33cd..221fa9d58bfca756a68536350bc2656f09f1fa30 100644 (file)
@@ -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
   )
index 7e8f955aa5864f9e86291a1bcfc184485ad23069..c7019bc645e618532d8b95dd61559928a340c7a5 100644 (file)
@@ -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
index 0f6b8fee673c65b1b5f6f046b47a4ceecc56356c..1260a1217dde51ef4eb045e6098c69ce55b1c88f 100644 (file)
@@ -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()
index 7ac85ab9bdf1b1bea6de2d620ed9a8216db85a1d..39533a94cd9a65921a147e4cbf02ad5c6e43e148 100644 (file)
@@ -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
index 8cc52142ee07166b06163d653e7557b2ec956784..9973a9d9ceef7ef713cdd19c82ac8a1a50af8da9 100644 (file)
@@ -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
index ded13977c05fe2c9285ba5f2aa949f1dc380781a..52b850a021f98c2846aeb62e1d049ab7d10f4eb8 100644 (file)
@@ -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")
index 87d421a37641a4a8de2e9a98898f03577f0d2a1a..bafd8fe2ac63dc32391d75eef44fcd82554c5f00 100644 (file)
@@ -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 )
index cbbbb0a0a49f3bb9171561b151714ade59634b21..763fd959d24c63c453f309ee32460564eb5a5325 100644 (file)
@@ -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
index 1c9e5c5a4f6d87beb44ae638192b1d9feb47514b..a261b5fd5049622063827bbab0acce6d2e329c5c 100644 (file)
@@ -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)
index 10075d71484452a6fc0c0f699b42e98ab950112a..62ccc17d0140f7a2d4e773e12f85ed217abc1a81 100644 (file)
@@ -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]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
-#  set(IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
+# else()
+#   string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
+#   set(IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
 endif()
 
 
index 96a2ca94babcd234c08dec734a6dd3ee34df3d7a..9c390d77743e052f8205cb6e224b44813df11f21 100644 (file)
@@ -188,11 +188,11 @@ if(OPENEXR_CUSTOM)
   endif()
   set(OpenEXR_Library ${OPENEXR_CUSTOM_LIBRARY})
 else()
-#elseif(${OPENEXR_VERSION} VERSION_LESS "2.1")
+# elseif(${OPENEXR_VERSION} VERSION_LESS "2.1")
   set(OpenEXR_Library IlmImf)
-#else()
-#  string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
-#  set(OpenEXR_Library IlmImf-${_openexr_libs_ver})
+# else()
+#   string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
+#   set(OpenEXR_Library IlmImf-${_openexr_libs_ver})
 endif()
 
 # Locate the OpenEXR library
index c5164913f7f2fb6ebef0e3c37787b9fbd49b9510..689550a17bbb1701a61506b4d1c5cb2abfd30413 100644 (file)
@@ -38,14 +38,14 @@ SET(_icu_SEARCH_DIRS
 )
 
 # We don't need includes, only libs to link against...
-#FIND_PATH(ICU_INCLUDE_DIR
-#  NAMES
-#    utf.h
-#  HINTS
-#    ${_icu_SEARCH_DIRS}
-#  PATH_SUFFIXES
-#    include/unicode
-#)
+# FIND_PATH(ICU_INCLUDE_DIR
+#   NAMES
+#     utf.h
+#   HINTS
+#     ${_icu_SEARCH_DIRS}
+#   PATH_SUFFIXES
+#     include/unicode
+# )
 
 FIND_LIBRARY(ICU_LIBRARY_DATA
   NAMES
index 84e1fbdb35c42a7817fc0b54e7208b864424ca28..966ac9a44594feda4fe7c41dca609bd77d2ed5fc 100644 (file)
@@ -83,9 +83,9 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_
   )
 
   FOREACH(_CURRENT_ABI_FLAGS ${_PYTHON_ABI_FLAGS_TEST})
-    #IF(CMAKE_BUILD_TYPE STREQUAL Debug)
-    #  SET(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}")
-    #ENDIF()
+    # IF(CMAKE_BUILD_TYPE STREQUAL Debug)
+    #   SET(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}")
+    # ENDIF()
     STRING(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
 
     IF(NOT DEFINED PYTHON_INCLUDE_DIR)
index e23d4dae48a7c8b45f2750ddefad4e24ce98dece..c56892689330bb081c16a1748de2084f0f590efb 100755 (executable)
@@ -149,6 +149,9 @@ def cmake_get_src(f):
 
                 if not l.startswith("#"):
 
+                    # Remove in-line comments.
+                    l = l.split(" # ")[0].rstrip()
+
                     if ")" in l:
                         if l.strip() != ")":
                             raise Exception("strict formatting not kept '*)' %s:%d" % (f, i))
index c3025be34bafa3fd113c7e9fc74d10743cbd8d58..4f5abf8d5611ae25b1703fa7c03dfbdac73d710a 100644 (file)
@@ -147,9 +147,9 @@ function(blender_include_dirs
     get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
     list(APPEND _ALL_INCS ${_ABS_INC})
     # for checking for invalid includes, disable for regular use
-    ##if(NOT EXISTS "${_ABS_INC}/")
-    ##  message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
-    ##endif()
+    # if(NOT EXISTS "${_ABS_INC}/")
+    #   message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+    # endif()
   endforeach()
   include_directories(${_ALL_INCS})
 endfunction()
@@ -162,9 +162,9 @@ function(blender_include_dirs_sys
   foreach(_INC ${ARGV})
     get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
     list(APPEND _ALL_INCS ${_ABS_INC})
-    ##if(NOT EXISTS "${_ABS_INC}/")
-    ##  message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
-    ##endif()
+    # if(NOT EXISTS "${_ABS_INC}/")
+    #   message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+    # endif()
   endforeach()
   include_directories(SYSTEM ${_ALL_INCS})
 endfunction()
@@ -173,7 +173,7 @@ function(blender_source_group
   sources
   )
 
-  #if enabled, use the sources directories as filters.
+  # if enabled, use the sources directories as filters.
   if(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS)
     foreach(_SRC ${sources})
       # remove ../'s
@@ -259,7 +259,7 @@ function(blender_add_lib__impl
   # listed is helpful for IDE's (QtCreator/MSVC)
   blender_source_group("${sources}")
 
-  #if enabled, set the FOLDER property for visual studio projects
+  # if enabled, set the FOLDER property for visual studio projects
   if(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS)
     get_filename_component(FolderDir ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
     string(REPLACE ${CMAKE_SOURCE_DIR} "" FolderDir ${FolderDir})
@@ -375,7 +375,7 @@ function(SETUP_LIBDIRS)
     endif()
     if(WITH_OPENCOLLADA)
       link_directories(${OPENCOLLADA_LIBPATH})
-      ## Never set
+      # # Never set
       # link_directories(${PCRE_LIBPATH})
       # link_directories(${EXPAT_LIBPATH})
     endif()
@@ -569,11 +569,11 @@ function(setup_liblinks
     ${ZLIB_LIBRARIES}
   )
 
-  #system libraries with no dependencies such as platform link libs or opengl should go last
+  # System libraries with no dependencies such as platform link libs or opengl should go last.
   target_link_libraries(${target}
       ${BLENDER_GL_LIBRARIES})
 
-  #target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
+  # target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
   target_link_libraries(${target} ${PLATFORM_LINKLIBS})
 endfunction()
 
@@ -1067,7 +1067,7 @@ function(data_to_c_simple_icons
   add_custom_command(
     OUTPUT  ${_file_from} ${_file_to}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
-    #COMMAND python3 ${CMAKE_SOURCE_DIR}/source/blender/datatoc/datatoc_icon.py ${_path_from_abs} ${_file_from}
+    # COMMAND python3 ${CMAKE_SOURCE_DIR}/source/blender/datatoc/datatoc_icon.py ${_path_from_abs} ${_file_from}
     COMMAND "$<TARGET_FILE:datatoc_icon>" ${_path_from_abs} ${_file_from}
     COMMAND "$<TARGET_FILE:datatoc>" ${_file_from} ${_file_to}
     DEPENDS
index 3ae3b2b66b5666e60d93a655e0a92b56b92f4357..578ad143d59f7ab8d2276814e7d55377f97e7242 100644 (file)
@@ -100,8 +100,8 @@ if(WITH_PYTHON)
     set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}m")
     set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}m")
     set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m")
-    #set(PYTHON_LIBRARY python${PYTHON_VERSION})
-    #set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python")  # won't  build with this enabled
+    # set(PYTHON_LIBRARY python${PYTHON_VERSION})
+    # set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python")  # won't  build with this enabled
 
     unset(_py_framework)
   endif()
@@ -218,12 +218,12 @@ if(WITH_OPENCOLLADA)
     ${OPENCOLLADA_LIBPATH}/libxml2.a
   )
   # PCRE is bundled with openCollada
-  #set(PCRE ${LIBDIR}/pcre)
-  #set(PCRE_LIBPATH ${PCRE}/lib)
+  # set(PCRE ${LIBDIR}/pcre)
+  # set(PCRE_LIBPATH ${PCRE}/lib)
   set(PCRE_LIBRARIES pcre)
   # libxml2 is used
-  #set(EXPAT ${LIBDIR}/expat)
-  #set(EXPAT_LIBPATH ${EXPAT}/lib)
+  # set(EXPAT ${LIBDIR}/expat)
+  # set(EXPAT_LIBPATH ${EXPAT}/lib)
   set(EXPAT_LIB)
 endif()
 
index ef7722b0aef48c51b77045ebd3ed268b398c4680..e2006be8fc2a3f84cf5354d0a93b5a6d27ee2149 100644 (file)
@@ -160,7 +160,7 @@ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MT")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
 
-#JMC is available on msvc 15.8 (1915) and up
+# JMC is available on msvc 15.8 (1915) and up
 if(MSVC_VERSION GREATER 1914 AND NOT MSVC_CLANG)
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /JMC")
 endif()
@@ -587,7 +587,7 @@ endif()
 # used in many places so include globally, like OpenGL
 blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}")
 
-#find signtool
+# Find signtool.
 set(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( )
 find_program(SIGNTOOL_EXE signtool
   HINTS
index 0d9010b15ea57b9b4d2a6261ac77871a74f85057..1952e418cfb2c4d042de933a5fdc0cb840cb1ba5 100644 (file)
@@ -46,9 +46,9 @@ if(WITH_DRACO)
 endif()
 
 # now only available in a branch
-#if(WITH_MOD_CLOTH_ELTOPO)
-#   add_subdirectory(eltopo)
-#endif()
+# if(WITH_MOD_CLOTH_ELTOPO)
+#    add_subdirectory(eltopo)
+# endif()
 
 if(WITH_BINRELOC)
   add_subdirectory(binreloc)
index 25e8e124885aa39c81020e3692f3f3e26f226151..a32911568c571cecddfd7251d9ed7bd5882cf534 100644 (file)
@@ -209,9 +209,9 @@ endif()
 
 if(WITH_CYCLES_OSL)
   add_definitions(-DWITH_OSL)
-  #osl 1.9.x
+  # osl 1.9.x
   add_definitions(-DOSL_STATIC_BUILD)
-  #pre 1.9
+  # pre 1.9
   add_definitions(-DOSL_STATIC_LIBRARY)
   include_directories(
     SYSTEM
index 66d955768a370811127fef462bab971e809edadb..09379bf2017a8f740bcec8113f3adba6e2da94b3 100644 (file)
@@ -32,6 +32,7 @@ set(SRC
   blender_viewport.cpp
 
   CCL_api.h
+  blender_device.h
   blender_object_cull.h
   blender_sync.h
   blender_session.h
index ea8aa197b6fa38b76eb4bee839dbc5d6244d8d60..782553e405c2b58f5ee5299ffb4e1bf1917da51a 100644 (file)
@@ -626,13 +626,13 @@ endif()
 
 # OpenCL kernel
 
-#set(KERNEL_PREPROCESSED ${CMAKE_CURRENT_BINARY_DIR}/kernel_preprocessed.cl)
-#add_custom_command(
-#   OUTPUT ${KERNEL_PREPROCESSED}
-#   COMMAND gcc -x c++ -E ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cl -I ${CMAKE_CURRENT_SOURCE_DIR}/../util/ -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -o ${KERNEL_PREPROCESSED}
-#   DEPENDS ${SRC_KERNEL} ${SRC_UTIL_HEADERS})
-#add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${KERNEL_PREPROCESSED})
-#delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${KERNEL_PREPROCESSED}" ${CYCLES_INSTALL_PATH}/kernel)
+# set(KERNEL_PREPROCESSED ${CMAKE_CURRENT_BINARY_DIR}/kernel_preprocessed.cl)
+# add_custom_command(
+#    OUTPUT ${KERNEL_PREPROCESSED}
+#    COMMAND gcc -x c++ -E ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cl -I ${CMAKE_CURRENT_SOURCE_DIR}/../util/ -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -o ${KERNEL_PREPROCESSED}
+#    DEPENDS ${SRC_KERNEL} ${SRC_UTIL_HEADERS})
+# add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${KERNEL_PREPROCESSED})
+# delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${KERNEL_PREPROCESSED}" ${CYCLES_INSTALL_PATH}/kernel)
 
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_OPENCL_KERNELS}" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl)
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_CUDA_KERNELS}" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/cuda)
index a6a6b6704f0ccc787c096f0fd57ebf2fad4b672c..0063422aaef8d24a4898525d2827c1f65c308e0d 100644 (file)
@@ -41,9 +41,13 @@ if(WITH_CYCLES_STANDALONE)
 endif()
 
 if(CYCLES_STANDALONE_REPOSITORY)
-  list(APPEND INC_SYS ../../third_party/numaapi/include)
+  list(APPEND INC_SYS
+    ../../third_party/numaapi/include
+  )
 else()
-  list(APPEND INC_SYS ../../numaapi/include)
+  list(APPEND INC_SYS
+    ../../numaapi/include
+  )
 endif()
 
 set(SRC_HEADERS
@@ -119,7 +123,7 @@ set(SRC_HEADERS
   util_types_float4_impl.h
   util_types_float8.h
   util_types_float8_impl.h
-    util_types_int2.h
+  util_types_int2.h
   util_types_int2_impl.h
   util_types_int3.h
   util_types_int3_impl.h
@@ -140,6 +144,7 @@ set(SRC_HEADERS
   util_types_ushort4.h
   util_types_vector3.h
   util_types_vector3_impl.h
+  util_unique_ptr.h
   util_vector.h
   util_version.h
   util_view.h
index b096fecced828bb9207f173a9c97b22fd5a0f104..ec2e84268bee6018f827ebf8c5d57598de7e256b 100644 (file)
@@ -152,6 +152,7 @@ elseif(APPLE AND NOT WITH_X11)
     intern/GHOST_DisplayManagerCocoa.h
     intern/GHOST_SystemCocoa.h
     intern/GHOST_WindowCocoa.h
+    intern/GHOST_WindowViewCocoa.h
   )
 
   if(NOT WITH_GL_EGL)
@@ -182,6 +183,7 @@ elseif(WITH_X11)
     intern/GHOST_WindowX11.cpp
 
     intern/GHOST_DisplayManagerX11.h
+    intern/GHOST_IconX11.h
     intern/GHOST_SystemX11.h
     intern/GHOST_TaskbarX11.h
     intern/GHOST_WindowX11.h
@@ -260,10 +262,10 @@ elseif(WITH_X11)
   add_definitions(-DWITH_X11)
 
 elseif(WIN32)
-  ## Warnings as errors, this is too strict!
-  #if(MSVC)
+  # # Warnings as errors, this is too strict!
+  # if(MSVC)
   #   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
-  #endif()
+  # endif()
 
   list(APPEND INC_SYS
     ${WINTAB_INC}
index dab24af7f8de9b07152f4b7776855ef6b2cc6253..1d4f846623c3b23046cef265298e1544624bc66e 100644 (file)
@@ -38,6 +38,10 @@ set(SRC
 
   # only so the header is known by cmake
   ../atomic/atomic_ops.h
+  ../atomic/intern/atomic_ops_ext.h
+  ../atomic/intern/atomic_ops_msvc.h
+  ../atomic/intern/atomic_ops_unix.h
+  ../atomic/intern/atomic_ops_utils.h
 )
 
 set(LIB
index be0c213b6e6030f647f0a72d18780509b7fcebf4..69f4bad62b243ff85a5d081a1545f0fd965dd8a8 100644 (file)
@@ -103,12 +103,12 @@ if(WITH_OPENSUBDIV)
   endif()
 
   # TODO(sergey): Put CUEW back when CUDA is officially supported by OSD.
-  #if(OPENSUBDIV_HAS_CUDA)
+  # if(OPENSUBDIV_HAS_CUDA)
   #   list(APPEND INC
-  #       ../../extern/cuew/include
+  #     ../../extern/cuew/include
   #   )
   #   add_definitions(-DOPENSUBDIV_HAS_CUEW)
-  #endif()
+  # endif()
 
   if(OPENSUBDIV_HAS_OPENCL)
     list(APPEND INC
index ec4246f5dba87a8848af75c7190e49640471e120..023980292fa3387ee0d072548e3abbeb71e73e08 100644 (file)
@@ -440,13 +440,13 @@ if(WITH_BULLET)
   add_definitions(-DWITH_BULLET)
 endif()
 
-#if(WITH_MOD_CLOTH_ELTOPO)
+# if(WITH_MOD_CLOTH_ELTOPO)
 #   list(APPEND INC
-#       ../../../extern/eltopo
-#       ../../../extern/eltopo/eltopo3d
+#     ../../../extern/eltopo
+#     ../../../extern/eltopo/eltopo3d
 #   )
 #   add_definitions(-DWITH_ELTOPO)
-#endif()
+# endif()
 
 if(WITH_IMAGE_OPENEXR)
   add_definitions(-DWITH_OPENEXR)
@@ -646,10 +646,10 @@ if(WITH_TBB)
   )
 endif()
 
-## Warnings as errors, this is too strict!
-#if(MSVC)
-#   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
-#endif()
+# # Warnings as errors, this is too strict!
+# if(MSVC)
+#    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+# endif()
 
 blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
index f0685b169fa7ad881d572f21be2240ebfd8157c2..ed14397f73cca50e342f3e8763f9a397e9b6a704 100644 (file)
@@ -486,7 +486,7 @@ set(SRC
   operations/COM_WrapOperation.cpp
   operations/COM_WrapOperation.h
 
-  #Filter operations
+  # Filter operations
   operations/COM_ConvolutionEdgeFilterOperation.cpp
   operations/COM_ConvolutionEdgeFilterOperation.h
   operations/COM_ConvolutionFilterOperation.cpp
@@ -515,7 +515,7 @@ set(SRC
   operations/COM_SetSamplerOperation.h
 
 
-  #Convert operations
+  # Convert operations
   operations/COM_ConvertOperation.cpp
   operations/COM_ConvertOperation.h
   operations/COM_IDMaskOperation.cpp
index 8a3a078bdd2d604c8cfbb35404b671a82f0f797a..1c7edb6c46a150f60063c1e017674dff046ef33b 100644 (file)
@@ -777,20 +777,20 @@ if(WITH_BLENDER)
     data_to_c_simple(../../../../release/datafiles/splash.png SRC)
     data_to_c_simple(../../../../release/datafiles/splash_2x.png SRC)
     # XXX These are handy, but give nasty "false changes" in svn :/
-    #svg_to_png(../../../../release/datafiles/blender_icons.svg
-               #../../../../release/datafiles/blender_icons16.png
-               #90 SRC)
+    # svg_to_png(../../../../release/datafiles/blender_icons.svg
+    #            ../../../../release/datafiles/blender_icons16.png
+    #            90 SRC)
 
     data_to_c_simple_icons(../../../../release/datafiles/blender_icons16 "icon16_" "${ICON_NAMES}" SRC)
-    #data_to_c_simple(../../../../release/datafiles/blender_icons16.png SRC)
-    #svg_to_png(../../../../release/datafiles/blender_icons.svg
-               #../../../../release/datafiles/blender_icons32.png
-               #180 SRC)
+    # data_to_c_simple(../../../../release/datafiles/blender_icons16.png SRC)
+    # svg_to_png(../../../../release/datafiles/blender_icons.svg
+    #            ../../../../release/datafiles/blender_icons32.png
+    #            180 SRC)
     data_to_c_simple_icons(../../../../release/datafiles/blender_icons32 "icon32_" "${ICON_NAMES}" SRC)
-    #data_to_c_simple(../../../../release/datafiles/blender_icons32.png SRC)
-    #svg_to_png(../../../../release/datafiles/prvicons.svg
-               #../../../../release/datafiles/prvicons.png
-               #90 SRC)
+    # data_to_c_simple(../../../../release/datafiles/blender_icons32.png SRC)
+    # svg_to_png(../../../../release/datafiles/prvicons.svg
+    #            ../../../../release/datafiles/prvicons.png
+    #            90 SRC)
     data_to_c_simple(../../../../release/datafiles/prvicons.png SRC)
 
     # brushes
index 0564cb078975f4d61cc4a9f39174c74d269db0e6..0c52dd1509284df9766459ee801a8413ca8b0398 100644 (file)
@@ -90,6 +90,7 @@ set(SRC
   ../include/ED_transverts.h
   ../include/ED_types.h
   ../include/ED_undo.h
+  ../include/ED_userpref.h
   ../include/ED_util.h
   ../include/ED_uvedit.h
   ../include/ED_view3d.h
index bca27442e65dd0022d25148c03657e0824b35837..799ec931d57409453cb1c2ab3d43f15d83d54f63 100644 (file)
@@ -92,6 +92,7 @@ set(SRC
   ${CMAKE_CURRENT_BINARY_DIR}/dna_verify.c
   ${SRC_DNA_INC}
 
+  dna_rename_defs.h
   dna_utils.h
 )
 
@@ -132,6 +133,7 @@ set(SRC
   ../DNA_cachefile_defaults.h
   ../DNA_camera_defaults.h
   ../DNA_curve_defaults.h
+  ../DNA_defaults.h
   ../DNA_image_defaults.h
   ../DNA_lattice_defaults.h
   ../DNA_light_defaults.h
@@ -142,9 +144,11 @@ set(SRC
   ../DNA_meta_defaults.h
   ../DNA_object_defaults.h
   ../DNA_scene_defaults.h
+  ../DNA_speaker_defaults.h
   ../DNA_texture_defaults.h
   ../DNA_vec_defaults.h
   ../DNA_view3d_defaults.h
+  ../DNA_world_defaults.h
 )
 
 set(LIB
index 259f656cc8c71089c021790785c7d75f1f289aaa..4bb53404724552b7c9ac83efde3a777f7f52d533 100644 (file)
@@ -174,7 +174,7 @@ set(INC
   ../../../../intern/clog
 
   # Needed for defaults forward declarations.
-  ../../../blender/blenloader
+  ../../blenloader
 
   ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
 )
index 59f99a9ff88fe91ffa39a24e711b5412dbacf633..12ab2f20ba19f24fce9f14b3c393b4e90b90d4a0 100644 (file)
@@ -100,6 +100,8 @@ set(SRC
   wm_event_types.h
   wm_files.h
   wm_window.h
+  intern/wm_platform_support.h
+  intern/wm_window_private.h
   gizmo/WM_gizmo_api.h
   gizmo/WM_gizmo_types.h
   gizmo/wm_gizmo_fn.h
index 2c9f91cca8ece5b6bc6a4f588b7ed8e508115341..3036be71564bc6354b4b5d284402d11a8a3dfbbe 100644 (file)
@@ -28,9 +28,9 @@ set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
 file(MAKE_DIRECTORY ${TEST_OUT_DIR})
 file(MAKE_DIRECTORY ${TEST_OUT_DIR}/io_tests)
 
-# if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
-#~      message(FATAL_ERROR "CMake test directory not found!")
-# endif()
+# if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
+#   message(FATAL_ERROR "CMake test directory not found!")
+# endif()
 
 # Run Blender command with parameters.
 function(add_blender_test testname)
index 13d2b4fd9ffdb4a45f0ca97ac26e43e4c73d5d7e..1e09b65b88018f7aeff8a5bffe6a8a91d61fa317 100644 (file)
@@ -29,9 +29,9 @@ set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
 # ugh, any better way to do this on testing only?
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR})
 
-# if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
-#~      message(FATAL_ERROR "CMake test directory not found!")
-# endif()
+# if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
+#   message(FATAL_ERROR "CMake test directory not found!")
+# endif()
 
 # all calls to blender use this
 if(APPLE)
@@ -61,5 +61,6 @@ endmacro()
 
 # Tests are disabled because they only work on Windows
 # Tests will be redone completely to work reliable
-#COLLADA_TEST(mesh simple mesh_simple.blend)
-#COLLADA_TEST(animation simple suzannes_parent_inverse.blend)
+#
+# COLLADA_TEST(mesh simple mesh_simple.blend)
+# COLLADA_TEST(animation simple suzannes_parent_inverse.blend)
index cca3cd22b67243bfd0b9a6a841e5c3939a9f6a9e..3f38ee4675fbbf63735f2290c3a387f844f89612 100644 (file)
@@ -25,9 +25,9 @@ set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
 # ugh, any better way to do this on testing only?
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR})
 
-# if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
-#~      message(FATAL_ERROR "CMake test directory not found!")
-# endif()
+# if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
+#   message(FATAL_ERROR "CMake test directory not found!")
+# endif()
 
 # for testing with valgrind prefix: valgrind --track-origins=yes --error-limit=no
 set(TEST_BLENDER_EXE $<TARGET_FILE:blender> --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
@@ -51,15 +51,15 @@ VIEW_LAYER_TEST(background_set)
 VIEW_LAYER_TEST(collection_new_sync)
 VIEW_LAYER_TEST(collection_rename_a)
 VIEW_LAYER_TEST(collection_rename_b)
-#VIEW_LAYER_TEST(evaluation_render_settings_a)
-#VIEW_LAYER_TEST(evaluation_render_settings_b)
-#VIEW_LAYER_TEST(evaluation_render_settings_c)
-#VIEW_LAYER_TEST(evaluation_render_settings_d)
-#VIEW_LAYER_TEST(evaluation_render_settings_e)
-#VIEW_LAYER_TEST(evaluation_render_settings_f)
-#VIEW_LAYER_TEST(evaluation_render_settings_g)
-#VIEW_LAYER_TEST(evaluation_render_settings_h)
-#VIEW_LAYER_TEST(evaluation_render_settings_i)
+# VIEW_LAYER_TEST(evaluation_render_settings_a)
+# VIEW_LAYER_TEST(evaluation_render_settings_b)
+# VIEW_LAYER_TEST(evaluation_render_settings_c)
+# VIEW_LAYER_TEST(evaluation_render_settings_d)
+# VIEW_LAYER_TEST(evaluation_render_settings_e)
+# VIEW_LAYER_TEST(evaluation_render_settings_f)
+# VIEW_LAYER_TEST(evaluation_render_settings_g)
+# VIEW_LAYER_TEST(evaluation_render_settings_h)
+# VIEW_LAYER_TEST(evaluation_render_settings_i)
 VIEW_LAYER_TEST(evaluation_visibility_a)
 VIEW_LAYER_TEST(evaluation_visibility_b)
 VIEW_LAYER_TEST(evaluation_visibility_c)