CMake: include missing headers
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Feb 2018 02:48:34 +0000 (13:48 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Feb 2018 02:50:05 +0000 (13:50 +1100)
build_files/cmake/cmake_consistency_check_config.py
extern/glog/CMakeLists.txt
intern/cycles/CMakeLists.txt
intern/cycles/app/CMakeLists.txt
source/blender/editors/interface/CMakeLists.txt

index 9ec1c095a9c72800b79e818d53fbdc99a4ae9b64..2fbf855c38638204ec33ccaaf0b8a356b1438247 100644 (file)
@@ -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",
 )
index 15e6aff9714e0ce8c55d71fb1a53777f5b968d3d..32f4dca77e8569d12e02d904f198d339557ef385 100644 (file)
@@ -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
index f720d389cbf19d3a1fb02cc58c2ff78707f4bdb1..e7b934ec74f357ebafaf4adbdcb13b87a1dd61cc 100644 (file)
@@ -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()
index 9ebeceb1659eb11598252bbda0f7e0db03bc8506..a8e0297aeaa22a9c012ee6be307d00dbb876f4e0 100644 (file)
@@ -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
index a6315e0fcce4c7184020d95aeaeeacbad2b75557..ede28b49dbee2a5e98caea70a287640b960f0cfe 100644 (file)
@@ -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)