80 lines
3.5 KiB
Plaintext
80 lines
3.5 KiB
Plaintext
--- CMakeLists.txt.orig 2026-09-30 10:33:53 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -134,6 +134,8 @@ elseif(NOT EMSCRIPTEN AND NOT ANDROID AND NOT IOS)
|
|
find_package(Libgit2 REQUIRED)
|
|
find_package(Pugixml REQUIRED)
|
|
find_package(SDL2 REQUIRED)
|
|
+ find_package(rlottie REQUIRED)
|
|
+ use_pkgconfig(lunasvg lunasvg)
|
|
endif()
|
|
|
|
# Add ALSA and BlueZ for Linux.
|
|
@@ -171,7 +173,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Od /DEBUG:FULL")
|
|
else()
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O0 -g3 -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros")
|
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
|
|
endif()
|
|
# The NOPTIMIZE macro is used to temporarily disable optimizations per function when debugging.
|
|
@@ -201,7 +203,7 @@ else()
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG /std:c++17 /O2 /DEBUG:NONE")
|
|
else()
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2 -DNDEBUG -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -DNDEBUG -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros")
|
|
if(APPLE)
|
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
|
|
else()
|
|
@@ -501,7 +503,8 @@ else()
|
|
${HarfBuzz_INCLUDE_DIRS}
|
|
${ICU_INCLUDE_DIRS}
|
|
${PUGIXML_INCLUDE_DIRS}
|
|
- ${SDL2_INCLUDE_DIR})
|
|
+ ${SDL2_INCLUDE_DIR}
|
|
+ ${lunasvg_INCLUDE_DIRS})
|
|
endif()
|
|
|
|
# For Linux, add the ALSA include directory.
|
|
@@ -643,7 +646,9 @@ else()
|
|
${HarfBuzz_LIBRARIES}
|
|
${ICU_LIBRARIES}
|
|
${PUGIXML_LIBRARIES}
|
|
- ${SDL2_LIBRARY})
|
|
+ ${SDL2_LIBRARY}
|
|
+ ${lunasvg_LINK_LIBRARIES}
|
|
+ ${rlottie_LIBRARIES})
|
|
if(Intl_LIBRARY)
|
|
# On Unix systems where the gettext functions are not part of the C standard library
|
|
# we need to explicitly link with the libintl library.
|
|
@@ -659,9 +664,6 @@ if(NOT WIN32)
|
|
elseif(IOS)
|
|
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/liblunasvg.a)
|
|
set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/librlottie.a)
|
|
- else()
|
|
- set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/liblunasvg.a)
|
|
- set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/librlottie.a)
|
|
endif()
|
|
endif()
|
|
|
|
@@ -702,18 +704,9 @@ add_subdirectory(es-pdf-converter)
|
|
endif()
|
|
|
|
add_subdirectory(es-pdf-converter)
|
|
-add_subdirectory(external)
|
|
add_subdirectory(es-core)
|
|
add_subdirectory(es-app)
|
|
|
|
-# Make sure that es-pdf-convert is built first, and then that rlottie is built before es-core.
|
|
-add_dependencies(lunasvg es-pdf-convert)
|
|
-
|
|
if(COMPILE_LOCALIZATIONS)
|
|
add_dependencies(es-pdf-convert localization)
|
|
endif()
|
|
-
|
|
-add_dependencies(es-core rlottie)
|
|
-
|
|
-# Set lottie2gif to not be built.
|
|
-set_target_properties(lottie2gif PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
|