diff options
| author | Michael Kowalski <makowalski@nvidia.com> | 2022-09-23 23:56:14 +0300 |
|---|---|---|
| committer | Michael Kowalski <makowalski@nvidia.com> | 2022-09-23 23:56:14 +0300 |
| commit | b2ad97ba97f3e55d1dd463e29ca0b2ec6fe761e1 (patch) | |
| tree | f94394835c6b731e4e379f4ef48fb78b4af4b9ca /source/blender/makesdna/intern/CMakeLists.txt | |
| parent | b31807c75f0c18c43ac6979e6da57dc9d420167a (diff) | |
| parent | 7e980f2b8cb96aa6d04dc72899d08473367eeeb9 (diff) | |
Merge branch 'master' into tmp-usd-alab-v2-T100452tmp-usd-alab-v2-T100452
Diffstat (limited to 'source/blender/makesdna/intern/CMakeLists.txt')
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index c26696b4572..0d04d7df067 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -3,16 +3,29 @@ # message(STATUS "Configuring makesdna") -add_definitions(-DWITH_DNA_GHASH) - -blender_include_dirs( - ../../../../intern/atomic - ../../../../intern/guardedalloc +set(INC + .. ../../blenlib ../../imbuf - .. + ../../../../intern/atomic + ../../../../intern/guardedalloc + ${CMAKE_CURRENT_BINARY_DIR} +) + +set(INC_SYS + ) +set(LIB +) + +add_definitions(-DWITH_DNA_GHASH) + +# Needed for `mallocn.c`. +if(HAVE_MALLOC_STATS_H) + add_definitions(-DHAVE_MALLOC_STATS_H) +endif() + set(dna_header_include_file "${CMAKE_CURRENT_BINARY_DIR}/dna_includes_all.h") set(dna_header_string_file "${CMAKE_CURRENT_BINARY_DIR}/dna_includes_as_strings.h") @@ -52,6 +65,8 @@ add_cc_flags_custom_test(makesdna) add_executable(makesdna ${SRC} ${SRC_DNA_INC}) setup_platform_linker_flags(makesdna) +blender_target_include_dirs(makesdna ${INC}) +blender_target_include_dirs_sys(makesdna ${INC_SYS}) if(WIN32 AND NOT UNIX) target_link_libraries(makesdna ${PTHREADS_LIBRARIES}) @@ -75,14 +90,6 @@ add_custom_command( # ----------------------------------------------------------------------------- # Build bf_dna library -set(INC - ${CMAKE_CURRENT_BINARY_DIR} -) - -set(INC_SYS - -) - set(SRC dna_defaults.c dna_genfile.c @@ -96,9 +103,6 @@ set(SRC dna_utils.h ) -set(LIB -) - set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/dna_type_offsets.h @@ -112,7 +116,10 @@ blender_add_lib(bf_dna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") # ----------------------------------------------------------------------------- # Build bf_dna_blenlib library set(INC - + ../../blenlib + ../../makesdna + ../../../../intern/atomic + ../../../../intern/guardedalloc ) set(INC_SYS |