kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

More targeted definition of DESKTOP_APP_USE_PACKAGED_RLOTTIE macro

Browse source 
Exclude it from common options, define it only for necessarily targets.
This commit is contained in:
Nicholas Guriev 2021-06-14 12:12:21 +03:00 • committed by John Preston
parent a87ac4ad0c
commit 78627af3f5
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
external/rlottie/CMakeLists.txt vendored
View file

@ -22,7 +22,12 @@ if (DESKTOP_APP_USE_PACKAGED)
endif()
endif()
if (NOT rlottie_FOUND AND NOT RLOTTIE_FOUND)
if (rlottie_FOUND OR RLOTTIE_FOUND)
target_compile_definitions(external_rlottie
INTERFACE
DESKTOP_APP_USE_PACKAGED_RLOTTIE
)
else()
add_library(external_rlottie_bundled STATIC)
init_target(external_rlottie_bundled "(external)")

7
options.cmake
View file

@ -77,13 +77,6 @@ if (DESKTOP_APP_USE_PACKAGED_FONTS)
)
endif()
if (rlottie_FOUND OR RLOTTIE_FOUND)
target_compile_definitions(common_options
INTERFACE
DESKTOP_APP_USE_PACKAGED_RLOTTIE
)
endif()
if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
target_compile_definitions(common_options
INTERFACE