Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-11-08 06:43:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-11-08 09:00:36 +0300
commitfb4b73751878d40b431e4aca11f20486b7219ef9 (patch)
tree3999f09b6b7d1ae32a8c7b3d14adbed0da17a8d8
parent27b37517f8ba113237a7ab58f20eb0c2de40323b (diff)
CMake: add missing headers to CMake lists
-rw-r--r--intern/ghost/CMakeLists.txt3
-rw-r--r--source/blender/blendthumb/CMakeLists.txt6
-rw-r--r--source/blender/functions/CMakeLists.txt2
3 files changed, 10 insertions, 1 deletions
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