diff options
author | Campbell Barton <campbell@blender.org> | 2022-02-23 04:30:56 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-02-23 04:31:46 +0300 |
commit | 4c423ccbd6f6f24d8cfdbc563127409cddc5fb55 (patch) | |
tree | 3ccd2b0a8d4eec451a5345911085c695173bc6e1 | |
parent | 4addc1f31e3db456a81dda89245bd09cd3faf80f (diff) |
CMake: include missing files
Also use SRC_ prefix for source variables so cmake_consistency_check.py
detects these files as being known to CMake.
-rw-r--r-- | intern/cycles/app/CMakeLists.txt | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/draw/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 17 |
5 files changed, 26 insertions, 8 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index ab38e103311..3248ef0dcda 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -34,8 +34,14 @@ endif() if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) add_definitions(${GL_DEFINITIONS}) - list(APPEND INC_SYS ${GLEW_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS}) - list(APPEND LIBRARIES ${CYCLES_GL_LIBRARIES} ${SDL2_LIBRARIES}) + list(APPEND INC_SYS + ${GLEW_INCLUDE_DIR} + ${SDL2_INCLUDE_DIRS} + ) + list(APPEND LIBRARIES + ${CYCLES_GL_LIBRARIES} + ${SDL2_LIBRARIES} + ) endif() # Common configuration. diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 78a145335b4..ad8b5813492 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -377,6 +377,7 @@ set(SRC BKE_idprop.hh BKE_idtype.h BKE_image.h + BKE_image_partial_update.hh BKE_image_save.h BKE_ipo.h BKE_kelvinlet.h diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index e1b6e218ff5..ca22315b2ed 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -240,6 +240,7 @@ set(SRC BLI_math_vec_mpq_types.hh BLI_math_vec_types.hh BLI_math_vector.h + BLI_math_vector.hh BLI_memarena.h BLI_memblock.h BLI_memiter.h @@ -308,6 +309,9 @@ set(SRC BLI_winstuff.h PIL_time.h PIL_time_utildefines.h + + # Without these files listed, they aren't known to CMake. + ../../../extern/json/include/json.hpp ) set(LIB diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 4103d9a7087..98f75ad6106 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -221,6 +221,8 @@ set(SRC engines/image/image_space_image.hh engines/image/image_space_node.hh engines/image/image_space.hh + engines/image/image_texture_info.hh + engines/image/image_usage.hh engines/image/image_wrappers.hh engines/workbench/workbench_engine.h engines/workbench/workbench_private.h diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index f2e189777f0..3ad43ef05af 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -147,6 +147,7 @@ set(SRC intern/gpu_select_private.h intern/gpu_shader_create_info.hh intern/gpu_shader_create_info_private.hh + intern/gpu_shader_dependency_private.h intern/gpu_shader_interface.hh intern/gpu_shader_private.hh intern/gpu_state_private.hh @@ -384,7 +385,7 @@ file(GENERATE OUTPUT ${glsl_source_list_file} CONTENT "${GLSL_SOURCE_CONTENT}") list(APPEND SRC ${glsl_source_list_file}) list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR}) -set(SHADER_CREATE_INFOS +set(SRC_SHADER_CREATE_INFOS ../draw/engines/workbench/shaders/infos/workbench_composite_info.hh ../draw/engines/workbench/shaders/infos/workbench_effect_antialiasing_info.hh ../draw/engines/workbench/shaders/infos/workbench_effect_cavity_info.hh @@ -435,7 +436,7 @@ set(SHADER_CREATE_INFOS ) set(SHADER_CREATE_INFOS_CONTENT "") -foreach(DESCRIPTOR_FILE ${SHADER_CREATE_INFOS}) +foreach(DESCRIPTOR_FILE ${SRC_SHADER_CREATE_INFOS}) string(APPEND SHADER_CREATE_INFOS_CONTENT "#include \"${DESCRIPTOR_FILE}\"\n") endforeach() @@ -486,18 +487,22 @@ if(WITH_GPU_SHADER_BUILDER) ) target_include_directories(shader_builder PRIVATE ${INC} ${CMAKE_CURRENT_BINARY_DIR}) - set(BAKED_CREATE_INFOS_FILE ${CMAKE_CURRENT_BINARY_DIR}/shader_baked.hh) + set(SRC_BAKED_CREATE_INFOS_FILE ${CMAKE_CURRENT_BINARY_DIR}/shader_baked.hh) add_custom_command( OUTPUT - ${BAKED_CREATE_INFOS_FILE} + ${SRC_BAKED_CREATE_INFOS_FILE} COMMAND - "$<TARGET_FILE:shader_builder>" ${BAKED_CREATE_INFOS_FILE} + "$<TARGET_FILE:shader_builder>" ${SRC_BAKED_CREATE_INFOS_FILE} DEPENDS shader_builder ) set(GPU_SHADER_INFO_SRC intern/gpu_shader_info_baked.cc - ${BAKED_CREATE_INFOS_FILE} + ${SRC_BAKED_CREATE_INFOS_FILE} + + # For project files to be aware of these headers. + ${SRC_SHADER_CREATE_INFOS} + shaders/infos/gpu_interface_info.hh ) blender_add_lib(bf_gpu_shader_infos "${GPU_SHADER_INFO_SRC}" "" "" "") |