CMake: add missing headers, use space before comments

7 files changed, 29 insertions, 22 deletions

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index ec4246f5dba..023980292fa 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -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}")
 
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index f0685b169fa..ed14397f73c 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -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
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 8a3a078bdd2..1c7edb6c46a 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -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
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 0564cb07897..0c52dd15092 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -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
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index bca27442e65..799ec931d57 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -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
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 259f656cc8c..4bb53404724 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -174,7 +174,7 @@ set(INC
   ../../../../intern/clog
 
   # Needed for defaults forward declarations.
-  ../../../blender/blenloader
+  ../../blenloader
 
   ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
 )
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 59f99a9ff88..12ab2f20ba1 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -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