Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

misc cmake update #397

Merged
merged 1 commit into from
Mar 2, 2023
Merged

misc cmake update #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
root = true

[CMakeLists.txt]
indent_style = tab
indent_size = 4
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,10 @@ if(BUILD_LUA_BINDINGS)
endif()

# rlottie
if( ENABLE_LOTTIE_PLUGIN )
if( ENABLE_LOTTIE_PLUGIN AND TARGET rlottie::rlottie )
list(APPEND CORE_LINK_LIBS rlottie::rlottie)
list(APPEND CORE_INCLUDE_DIRS rlottie::rlottie)
elseif( ENABLE_LOTTIE_PLUGIN )
# Try to find the rlottie library.
if(NOT DEFINED rlottie_DIR)
set(rlottie_DIR $ENV{RLOTTIE_DIR})
Expand Down Expand Up @@ -1000,6 +1003,7 @@ endif()
include(CMakePackageConfigHelpers OPTIONAL RESULT_VARIABLE PkgHelpers_AVAILABLE)

# guard against older versions of cmake which do not provide it
if(${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME})
if(PkgHelpers_AVAILABLE)
set (INCLUDE_INSTALL_DIR "include")
set (LIB_INSTALL_DIR "lib")
Expand Down Expand Up @@ -1039,4 +1043,5 @@ else()
" please update cmake to version which provides CMakePackageConfighelpers module"
" or write generators for RmlUiConfig.cmake by yourself.")
endif()
endif()