From 8f9386596fb0471c972921e6543b3a0adc3ffb3d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 9 Feb 2018 13:48:34 +1100
Subject: CMake: include missing headers

---
 build_files/cmake/cmake_consistency_check_config.py | 4 ----
 extern/glog/CMakeLists.txt                          | 1 +
 intern/cycles/CMakeLists.txt                        | 2 +-
 intern/cycles/app/CMakeLists.txt                    | 8 ++++++--
 source/blender/editors/interface/CMakeLists.txt     | 2 ++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build_files/cmake/cmake_consistency_check_config.py b/build_files/cmake/cmake_consistency_check_config.py
index 9ec1c095a9c..2fbf855c386 100644
--- a/build_files/cmake/cmake_consistency_check_config.py
+++ b/build_files/cmake/cmake_consistency_check_config.py
@@ -25,10 +25,6 @@ IGNORE = (
     "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h",
-    "extern/carve/include/carve/config.h",
-    "extern/carve/include/carve/random/random.h",
-    "extern/carve/patches/files/config.h",
-    "extern/carve/patches/files/random.h",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
     "intern/audaspace/SRC/AUD_SRCResampleReader.h",
 )
diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index 15e6aff9714..32f4dca77e8 100644
--- a/extern/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -40,6 +40,7 @@ set(SRC
 
 	src/config.h
 	src/config_freebsd.h
+	src/config_haiku.h
 	src/config_hurd.h
 	src/config_linux.h
 	src/config_mac.h
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index f720d389cbf..e7b934ec74f 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -253,7 +253,7 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))
 		elseif(${CUDA_VERSION} EQUAL "9.1")
 			set(MAX_MSVC 1911)
 		endif()
-		if (NOT MSVC_VERSION LESS ${MAX_MSVC})
+		if(NOT MSVC_VERSION LESS ${MAX_MSVC})
 			message(STATUS "nvcc not supported for this compiler version, using cycles_cubin_cc instead.")
 			set(WITH_CYCLES_CUBIN_COMPILER ON)
 		endif()
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 9ebeceb1659..a8e0297aeaa 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -128,8 +128,12 @@ if(WITH_CYCLES_CUBIN_COMPILER)
 	if(MSVC AND NOT CMAKE_CL_64)
 		Message("cycles_cubin_cc not supported on x86")
 	else()
-		set(SRC cycles_cubin_cc.cpp)
-		set(INC ../../../extern/cuew/include)
+		set(SRC
+			cycles_cubin_cc.cpp
+		)
+		set(INC
+			../../../extern/cuew/include
+		)
 		add_executable(cycles_cubin_cc ${SRC})
 		include_directories(${INC})
 		target_link_libraries(cycles_cubin_cc
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index a6315e0fcce..ede28b49dbe 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -69,7 +69,9 @@ set(SRC
 	view2d.c
 	view2d_ops.c
 
+	interface_eyedropper_intern.h
 	interface_intern.h
+	interface_regions_intern.h
 )
 
 if(WITH_INTERNATIONAL)
-- 
cgit v1.2.3