From 0ffd288fab5686f55d68d0d39baf59568f4389e7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 18 Sep 2022 07:41:13 +0200 Subject: Build: fix gtest build flags affecting actual library Switch to target_ functions to avoid this. --- source/blender/makesrna/intern/CMakeLists.txt | 59 +++++++++++++-------------- 1 file changed, 28 insertions(+), 31 deletions(-) (limited to 'source/blender/makesrna/intern/CMakeLists.txt') diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 7e6e3bcf90e..2b06daf34e3 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -185,10 +185,33 @@ set(SRC ) set(INC - ../../../../intern/clog - - # Needed for defaults forward declarations. + . + .. + ../../blenfont + ../../blenkernel + ../../blenlib ../../blenloader + ../../blentranslation + ../../bmesh + ../../depsgraph + ../../draw + ../../gpu + ../../ikplugin + ../../imbuf + ../../makesdna + ../../modifiers + ../../nodes/ + ../../sequencer + ../../simulation + ../../windowmanager + ../../editors/include + ../../render + ../../../../intern/clog + ../../../../intern/cycles/blender + ../../../../intern/atomic + ../../../../intern/guardedalloc + ../../../../intern/memutil + ../../../../intern/mantaflow/extern ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern @@ -369,38 +392,12 @@ if(WITH_GMP) endif() # Build makesrna executable -blender_include_dirs( - . - .. - ../../blenfont - ../../blenkernel - ../../blenlib - ../../blentranslation - ../../bmesh - ../../depsgraph - ../../draw - ../../gpu - ../../ikplugin - ../../imbuf - ../../makesdna - ../../modifiers - ../../nodes/ - ../../sequencer - ../../simulation - ../../windowmanager - ../../editors/include - ../../render - ../../../../intern/cycles/blender - ../../../../intern/atomic - ../../../../intern/guardedalloc - ../../../../intern/memutil - ../../../../intern/mantaflow/extern -) - add_cc_flags_custom_test(makesrna) add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC}) setup_platform_linker_flags(makesrna) +blender_target_include_dirs(makesrna ${INC}) +blender_target_include_dirs_sys(makesrna ${INC_SYS}) target_link_libraries(makesrna bf_dna) target_link_libraries(makesrna bf_dna_blenlib) -- cgit v1.2.3