CMake: add missing headers, use space before comments

7 files changed, 30 insertions, 18 deletions

diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 25e8e124885..a32911568c5 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -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
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 66d955768a3..09379bf2017 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -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
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index ea8aa197b6f..782553e405c 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -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)
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index a6a6b6704f0..0063422aaef 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -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
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index b096fecced8..ec2e84268be 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -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}
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index dab24af7f8d..1d4f846623c 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -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
diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt
index be0c213b6e6..69f4bad62b2 100644
--- a/intern/opensubdiv/CMakeLists.txt
+++ b/intern/opensubdiv/CMakeLists.txt
@@ -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