[Bf-blender-cvs] [34d289f98cb] blender-v3.0-release: CMake: add missing headers to CMake lists
Campbell Barton
noreply at git.blender.org
Mon Nov 8 04:53:04 CET 2021
Commit: 34d289f98cb076735b9c24f9985832abc475cb05
Author: Campbell Barton
Date: Mon Nov 8 14:43:45 2021 +1100
Branches: blender-v3.0-release
https://developer.blender.org/rB34d289f98cb076735b9c24f9985832abc475cb05
CMake: add missing headers to CMake lists
===================================================================
M intern/ghost/CMakeLists.txt
M source/blender/blendthumb/CMakeLists.txt
M source/blender/functions/CMakeLists.txt
===================================================================
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 05423209c71..41642311185 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -489,6 +489,9 @@ if(WITH_XR_OPENXR)
intern/GHOST_XrSwapchain.h
intern/GHOST_Xr_intern.h
intern/GHOST_Xr_openxr_includes.h
+
+ # Header only library.
+ ../../extern/tinygltf/tiny_gltf.h
)
list(APPEND INC
../../extern/json/include
diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt
index 4c2e72418a0..e2d278255ba 100644
--- a/source/blender/blendthumb/CMakeLists.txt
+++ b/source/blender/blendthumb/CMakeLists.txt
@@ -60,7 +60,11 @@ else()
# -----------------------------------------------------------------------------
# Build `blender-thumbnailer` executable
- add_executable(blender-thumbnailer ${SRC} src/blender_thumbnailer.cc)
+ set(SRC_CMD
+ src/blender_thumbnailer.cc
+ )
+
+ add_executable(blender-thumbnailer ${SRC} ${SRC_CMD})
target_link_libraries(blender-thumbnailer bf_blenlib)
target_link_libraries(blender-thumbnailer ${PTHREADS_LIBRARIES})
endif()
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 74625fe2826..54670c0d1b3 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -94,6 +94,8 @@ if(WITH_GTESTS)
tests/FN_generic_vector_array_test.cc
tests/FN_multi_function_procedure_test.cc
tests/FN_multi_function_test.cc
+
+ tests/FN_multi_function_test_common.hh
)
set(TEST_LIB
bf_functions
More information about the Bf-blender-cvs
mailing list