diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-09-15 15:50:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-09-15 15:53:44 +0300 |
commit | dd25d47e8a14365e359bbfa493dc8d7e29e96cbd (patch) | |
tree | e9ab6427182760c0623ca35db3d7f2b21422186a /source | |
parent | 7177a580ccd4c31af83254fe71f06c1c1d868c44 (diff) |
Cleanup: add missing headers to CMake, formatting
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/draw/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/editors/util/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/functions/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 2 |
5 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 1344d390871..af264365c25 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -172,6 +172,8 @@ set(SRC engines/eevee/eevee_lut.h engines/eevee/eevee_private.h engines/external/external_engine.h + engines/image/image_engine.h + engines/image/image_private.h engines/workbench/workbench_engine.h engines/workbench/workbench_private.h engines/select/select_engine.h diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index e05d1fedf6d..b09676fa547 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -51,6 +51,7 @@ set(SRC ../include/ED_curve.h ../include/ED_datafiles.h ../include/ED_fileselect.h + ../include/ED_geometry.h ../include/ED_gizmo_library.h ../include/ED_gizmo_utils.h ../include/ED_gpencil.h diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt index ad29dbe6668..9a6b6f4a4db 100644 --- a/source/blender/functions/CMakeLists.txt +++ b/source/blender/functions/CMakeLists.txt @@ -68,7 +68,7 @@ if(WITH_GTESTS) tests/FN_multi_function_test.cc tests/FN_spans_test.cc ) - set (TEST_LIB + set(TEST_LIB bf_functions ) include(GTestTesting) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index b763ea2a528..2dd61a3548b 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -116,6 +116,7 @@ set(SRC GPU_debug.h GPU_drawlist.h GPU_framebuffer.h + GPU_glew.h GPU_immediate.h GPU_immediate_util.h GPU_index_buffer.h @@ -139,6 +140,7 @@ set(SRC intern/gpu_capabilities_private.hh intern/gpu_codegen.h intern/gpu_context_private.hh + intern/gpu_debug_private.hh intern/gpu_drawlist_private.hh intern/gpu_framebuffer_private.hh intern/gpu_immediate_private.hh @@ -384,6 +386,8 @@ if(WITH_GTESTS) if(WITH_OPENGL_DRAW_TESTS) set(TEST_SRC tests/gpu_testing.cc + + tests/gpu_testing.hh ) set(TEST_INC "../../../intern/ghost/" diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 2798cec8c58..43f77556ba1 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1156,7 +1156,7 @@ if(WIN32) set_target_properties(blender PROPERTIES PDB_NAME "blender_private" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>") - if (WITH_WINDOWS_PDB AND WITH_WINDOWS_STRIPPED_PDB) + if(WITH_WINDOWS_PDB AND WITH_WINDOWS_STRIPPED_PDB) # This is slightly messy, but single target generators like ninja will not have the # CMAKE_CFG_INTDIR variable and multitarget generators like msbuild will not have # CMAKE_BUILD_TYPE. This can be simplified by target_link_options and the $<CONFIG> |