From 51cb73b987e264425608ef0111b8b43012e49aff Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 22 Aug 2024 17:32:22 +0200 Subject: [PATCH] (Haiku) Added support for the PDF viewer --- CMakeLists.txt | 17 +++++------------ es-app/CMakeLists.txt | 4 +--- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9eaa5d8d..efd417f37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -715,26 +715,19 @@ if(COMPILE_LOCALIZATIONS) add_subdirectory(locale) endif() -if(NOT HAIKU) - 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. -# Also set lottie2gif to not be built. -if(NOT HAIKU) - add_dependencies(lunasvg es-pdf-convert) -endif() +add_dependencies(lunasvg es-pdf-convert) if(COMPILE_LOCALIZATIONS) - if(NOT HAIKU) - add_dependencies(es-pdf-convert localization) - else() - add_dependencies(lunasvg localization) - endif() + 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) diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 20e47a44f..c238399d6 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -273,9 +273,7 @@ elseif(APPLE) install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION ../Resources) elseif(NOT ANDROID) install(TARGETS es-de RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) - if(NOT HAIKU) - install(TARGETS es-pdf-convert RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) - endif() + install(TARGETS es-pdf-convert RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) if(CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/es-de.6.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)