diff --git a/CMakeLists.txt b/CMakeLists.txt index 175e716b4..826874b9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,9 +39,9 @@ endif(USE_DEBUG_EXTRA_OPTS) if(MSVC) # Force to always compile with W4 if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") endif() elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) # Update if necessary @@ -138,9 +138,9 @@ SET (DESKTOP_DEFS -DCOLOR_BACKBUFFER=1 -DLDOM_USE_OWN_MEM_MAN=1 -DUSE_FREETYPE=1 #SET (DESKTOP_DEFS -DCOLOR_BACKBUFFER=0 -DGRAY_BACKBUFFER_BITS=4 -DLDOM_USE_OWN_MEM_MAN=1 -DUSE_FREETYPE=1 ) if( ${GUI} STREQUAL QT ) -FIND_PACKAGE( Qt4 REQUIRED ) -INCLUDE(${QT_USE_FILE}) -SET(QT_3RDPARTY_DIR ${QT_INCLUDE_DIR}/../src/3rdparty) + FIND_PACKAGE( Qt4 REQUIRED ) + INCLUDE(${QT_USE_FILE}) + SET(QT_3RDPARTY_DIR ${QT_INCLUDE_DIR}/../src/3rdparty) endif( ${GUI} STREQUAL QT ) if( ${GUI} STREQUAL QT5 ) @@ -194,165 +194,165 @@ if (MAC) endif(MAC) if (NOT MAC) -if (DEFINED USE_QT_ZLIB) - SET(ZLIB_INCLUDE_DIR ${QT_INCLUDE_DIR}/../src/3rdparty/zlib) - message("Using QT ZLIB ${USE_QT_ZLIB} include dir: ${ZLIB_INCLUDE_DIR}\n") -# SET(ZLIB_LIBRARIES "") -else() - -if (NOT MSVC AND NOT DEFINED USE_STATIC_ZLIB) -FIND_PACKAGE(ZLIB) -endif (NOT MSVC AND NOT DEFINED USE_STATIC_ZLIB) - -if (NOT ZLIB_FOUND) - message("System ZLIB not found, will build local one\n") - ADD_SUBDIRECTORY(thirdparty/${REPO_ZLIB_SRCDIR}) - SET(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/${REPO_ZLIB_SRCDIR} ${CMAKE_BINARY_DIR}/thirdparty/${REPO_ZLIB_SRCDIR} CACHE PATH "" FORCE) - SET(ZLIB_LIBRARIES zlibstatic) -endif (NOT ZLIB_FOUND) -endif(DEFINED USE_QT_ZLIB) + if (DEFINED USE_QT_ZLIB) + SET(ZLIB_INCLUDE_DIR ${QT_INCLUDE_DIR}/../src/3rdparty/zlib) + message("Using QT ZLIB ${USE_QT_ZLIB} include dir: ${ZLIB_INCLUDE_DIR}\n") + # SET(ZLIB_LIBRARIES "") + else() + + if (NOT MSVC AND NOT DEFINED USE_STATIC_ZLIB) + FIND_PACKAGE(ZLIB) + endif (NOT MSVC AND NOT DEFINED USE_STATIC_ZLIB) + + if (NOT ZLIB_FOUND) + message("System ZLIB not found, will build local one\n") + ADD_SUBDIRECTORY(thirdparty/${REPO_ZLIB_SRCDIR}) + SET(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/${REPO_ZLIB_SRCDIR} ${CMAKE_BINARY_DIR}/thirdparty/${REPO_ZLIB_SRCDIR} CACHE PATH "" FORCE) + SET(ZLIB_LIBRARIES zlibstatic) + endif (NOT ZLIB_FOUND) + endif(DEFINED USE_QT_ZLIB) endif(NOT MAC) if (NOT ${GUI} STREQUAL FB2PROPS ) -if (NOT MAC) - -if (NOT MSVC AND NOT CR3_PNG) -FIND_PACKAGE(PNG) -endif (NOT MSVC AND NOT CR3_PNG) - -if (NOT PNG_FOUND) - message("System LIBPNG not found, will build local one\n") - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) - SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES}) - ADD_SUBDIRECTORY(thirdparty/${REPO_LIBPNG_SRCDIR}) - SET(PNG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/${REPO_LIBPNG_SRCDIR} ${CMAKE_BINARY_DIR}/thirdparty/${REPO_LIBPNG_SRCDIR} CACHE PATH "" FORCE) - SET(PNG_LIBRARIES png) -endif (NOT PNG_FOUND) - -if (NOT MSVC AND NOT CR3_JPEG) -FIND_PACKAGE(JPEG) -endif (NOT MSVC AND NOT CR3_JPEG) -if (NOT JPEG_FOUND) - message("System LIBJPEG not found, will build local one\n") - ADD_SUBDIRECTORY(thirdparty/${REPO_LIBJPEG_SRCDIR}) - SET(JPEG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_LIBJPEG_SRCDIR} CACHE PATH "" FORCE) - SET(JPEG_LIBRARIES jpeg) -endif (NOT JPEG_FOUND) - -if (NOT MSVC AND NOT CR3_FREETYPE) -FIND_PACKAGE(Freetype 2.10.0) -FIND_PACKAGE(HarfBuzz 2.6.0) -endif (NOT MSVC AND NOT CR3_FREETYPE) - -ADD_SUBDIRECTORY(thirdparty_unman/qimagescale) - -if (NOT FREETYPE_FOUND) - message("System FREETYPE not found, will build local one\n") - if (NOT HarfBuzz_FOUND) - SET(HarfBuzz_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE) - SET(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE) - SET(HarfBuzz_LIBRARIES harfbuzz CACHE PATH "" FORCE) - SET(HARFBUZZ_INCLUDE_DIR ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE) - SET(HARFBUZZ_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIRS} CACHE PATH "" FORCE) - SET(HARFBUZZ_LIBRARIES ${HarfBuzz_LIBRARIES} CACHE PATH "" FORCE) - endif (NOT HarfBuzz_FOUND) - SET(FT_WITH_ZLIB ON CACHE BOOL "Use system zlib instead of internal library." FORCE) - SET(FT_WITH_PNG ON CACHE BOOL "Support PNG compressed OpenType embedded bitmaps." FORCE) - SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES}) - SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE PATH "" FORCE) - SET(PNG_LIBRARY ${PNG_LIBRARIES}) - SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE) - ADD_SUBDIRECTORY(thirdparty/${REPO_FREETYPE_SRCDIR}) - SET(FREETYPE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_FREETYPE_SRCDIR}/include CACHE PATH "" FORCE) - SET(FREETYPE_LIBRARIES freetype) -endif (NOT FREETYPE_FOUND) - -if (NOT HarfBuzz_FOUND) - message("System HarfBuzz not found, will build local one\n") - SET(HB_HAVE_FREETYPE ON CACHE BOOL "Enable freetype interop helpers" FORCE) - SET(HB_BUILD_TESTS OFF CACHE BOOL "Build harfbuzz tests" FORCE) - SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES}) - SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE) - ADD_SUBDIRECTORY(thirdparty/${REPO_HARFBUZZ_SRCDIR}) - SET(HarfBuzz_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE) - SET(HarfBuzz_LIBRARY harfbuzz) -endif (NOT HarfBuzz_FOUND) - -if (NOT MSVC) - find_package(FontConfig 2.11.0) -endif(NOT MSVC) - -if (FONTCONFIG_FOUND) - set(DESKTOP_DEFS ${DESKTOP_DEFS} -DUSE_FONTCONFIG=1) -else() - set(DESKTOP_DEFS ${DESKTOP_DEFS} -DUSE_FONTCONFIG=0) -endif (FONTCONFIG_FOUND) - -if (NOT MSVC) -find_package(FriBidi 1.0.0) -if (NOT FRIBIDI_FOUND) - message("System FriBidi not found, will build local one\n") - ADD_SUBDIRECTORY(thirdparty/${REPO_FRIBIDI_SRCDIR}) - SET(FRIBIDI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/${REPO_FRIBIDI_SRCDIR}/lib CACHE PATH "" FORCE) - SET(FRIBIDI_LIBRARIES fribidi) - set(DESKTOP_DEFS ${DESKTOP_DEFS} -DBUNDLED_FRIBIDI=1 -I${CMAKE_BINARY_DIR}/thirdparty/${REPO_FRIBIDI_SRCDIR}) -endif (NOT FRIBIDI_FOUND) -endif(NOT MSVC) - - -if (NOT MSVC) - find_package(libunibreak 4.0) -endif(NOT MSVC) - -if (NOT LIBUNIBREAK_FOUND) - message("System libunibreak not found, will build local one\n") - ADD_SUBDIRECTORY(thirdparty/${REPO_LIBUNIBREAK_SRCDIR}) - SET(LIBUNIBREAK_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/${REPO_LIBUNIBREAK_SRCDIR}/src CACHE PATH "" FORCE) - SET(LIBUNIBREAK_LIBRARIES unibreak) -endif (NOT LIBUNIBREAK_FOUND) - -find_package(ZSTD 1.4.0) -if (NOT ZSTD_FOUND) - message("\nSystem zstd not found, will build local one\n") - set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "LEGACY SUPPORT" FORCE) - set(ZSTD_MULTITHREAD_SUPPORT OFF CACHE BOOL "MULTITHREADING SUPPORT" FORCE) - set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "BUILD PROGRAMS" FORCE) - set(ZSTD_BUILD_CONTRIB OFF CACHE BOOL "BUILD CONTRIB" FORCE) - set(ZSTD_BUILD_TESTS OFF CACHE BOOL "BUILD TESTS" FORCE) - set(ZSTD_BUILD_STATIC ON CACHE BOOL "BUILD STATIC LIBRARIES" FORCE) - set(ZSTD_BUILD_SHARED OFF CACHE BOOL "BUILD SHARED LIBRARIES" FORCE) - add_subdirectory(thirdparty/${REPO_ZSTD_SRCDIR}/build/cmake) - SET(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_ZSTD_SRCDIR}/lib CACHE PATH "Include directories needed to use ZSTD" FORCE) - SET(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "Libraries needed to link to ZSTD" FORCE) -endif(NOT ZSTD_FOUND) - -find_package(utf8proc) - -if (UTF8PROC_FOUND) - set(DESKTOP_DEFS ${DESKTOP_DEFS} -DUSE_UTF8PROC=1) -else() - set(DESKTOP_DEFS ${DESKTOP_DEFS} -DUSE_UTF8PROC=0) -endif (UTF8PROC_FOUND) - -endif (NOT MAC) - -#if (ENABLE_CHM) -message("Will build patched LIBCHM library\n") -ADD_SUBDIRECTORY(thirdparty_unman/chmlib) -SET(CHM_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty_unman/chmlib/src) -SET(CHM_LIBRARIES chmlib) -ADD_DEFINITIONS(-DCHM_SUPPORT_ENABLED=1) -#else() -#ADD_DEFINITIONS(-DCHM_SUPPORT_ENABLED=0) -#endif(ENABLE_CHM) - -message("Will build patched ANTIWORD library\n") -ADD_DEFINITIONS(-DCR3_ANTIWORD_PATCH=1) -ADD_SUBDIRECTORY(thirdparty_unman/antiword) -SET(ANTIWORD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty_unman/antiword) -SET(ANTIWORD_LIBRARIES antiword) -ADD_DEFINITIONS(-DENABLE_ANTIWORD=1) -INCLUDE_DIRECTORIES( ${ANTIWORD_INCLUDE_DIR} ) + if (NOT MAC) + + if (NOT MSVC AND NOT CR3_PNG) + FIND_PACKAGE(PNG) + endif (NOT MSVC AND NOT CR3_PNG) + + if (NOT PNG_FOUND) + message("System LIBPNG not found, will build local one\n") + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES}) + ADD_SUBDIRECTORY(thirdparty/${REPO_LIBPNG_SRCDIR}) + SET(PNG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/${REPO_LIBPNG_SRCDIR} ${CMAKE_BINARY_DIR}/thirdparty/${REPO_LIBPNG_SRCDIR} CACHE PATH "" FORCE) + SET(PNG_LIBRARIES png) + endif (NOT PNG_FOUND) + + if (NOT MSVC AND NOT CR3_JPEG) + FIND_PACKAGE(JPEG) + endif (NOT MSVC AND NOT CR3_JPEG) + if (NOT JPEG_FOUND) + message("System LIBJPEG not found, will build local one\n") + ADD_SUBDIRECTORY(thirdparty/${REPO_LIBJPEG_SRCDIR}) + SET(JPEG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_LIBJPEG_SRCDIR} CACHE PATH "" FORCE) + SET(JPEG_LIBRARIES jpeg) + endif (NOT JPEG_FOUND) + + if (NOT MSVC AND NOT CR3_FREETYPE) + FIND_PACKAGE(Freetype 2.10.0) + FIND_PACKAGE(HarfBuzz 2.6.0) + endif (NOT MSVC AND NOT CR3_FREETYPE) + + ADD_SUBDIRECTORY(thirdparty_unman/qimagescale) + + if (NOT FREETYPE_FOUND) + message("System FREETYPE not found, will build local one\n") + if (NOT HarfBuzz_FOUND) + SET(HarfBuzz_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE) + SET(HarfBuzz_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE) + SET(HarfBuzz_LIBRARIES harfbuzz CACHE PATH "" FORCE) + SET(HARFBUZZ_INCLUDE_DIR ${HarfBuzz_INCLUDE_DIR} CACHE PATH "" FORCE) + SET(HARFBUZZ_INCLUDE_DIRS ${HarfBuzz_INCLUDE_DIRS} CACHE PATH "" FORCE) + SET(HARFBUZZ_LIBRARIES ${HarfBuzz_LIBRARIES} CACHE PATH "" FORCE) + endif (NOT HarfBuzz_FOUND) + SET(FT_WITH_ZLIB ON CACHE BOOL "Use system zlib instead of internal library." FORCE) + SET(FT_WITH_PNG ON CACHE BOOL "Support PNG compressed OpenType embedded bitmaps." FORCE) + SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES}) + SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE PATH "" FORCE) + SET(PNG_LIBRARY ${PNG_LIBRARIES}) + SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE) + ADD_SUBDIRECTORY(thirdparty/${REPO_FREETYPE_SRCDIR}) + SET(FREETYPE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_FREETYPE_SRCDIR}/include CACHE PATH "" FORCE) + SET(FREETYPE_LIBRARIES freetype) + endif (NOT FREETYPE_FOUND) + + if (NOT HarfBuzz_FOUND) + message("System HarfBuzz not found, will build local one\n") + SET(HB_HAVE_FREETYPE ON CACHE BOOL "Enable freetype interop helpers" FORCE) + SET(HB_BUILD_TESTS OFF CACHE BOOL "Build harfbuzz tests" FORCE) + SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES}) + SET(SKIP_INSTALL_ALL ON CACHE BOOL "Don't install anything" FORCE) + ADD_SUBDIRECTORY(thirdparty/${REPO_HARFBUZZ_SRCDIR}) + SET(HarfBuzz_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_HARFBUZZ_SRCDIR}/src CACHE PATH "" FORCE) + SET(HarfBuzz_LIBRARY harfbuzz) + endif (NOT HarfBuzz_FOUND) + + if (NOT MSVC) + find_package(FontConfig 2.11.0) + endif(NOT MSVC) + + if (FONTCONFIG_FOUND) + set(DESKTOP_DEFS ${DESKTOP_DEFS} -DUSE_FONTCONFIG=1) + else() + set(DESKTOP_DEFS ${DESKTOP_DEFS} -DUSE_FONTCONFIG=0) + endif (FONTCONFIG_FOUND) + + if (NOT MSVC) + find_package(FriBidi 1.0.0) + if (NOT FRIBIDI_FOUND) + message("System FriBidi not found, will build local one\n") + ADD_SUBDIRECTORY(thirdparty/${REPO_FRIBIDI_SRCDIR}) + SET(FRIBIDI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/${REPO_FRIBIDI_SRCDIR}/lib CACHE PATH "" FORCE) + SET(FRIBIDI_LIBRARIES fribidi) + set(DESKTOP_DEFS ${DESKTOP_DEFS} -DBUNDLED_FRIBIDI=1 -I${CMAKE_BINARY_DIR}/thirdparty/${REPO_FRIBIDI_SRCDIR}) + endif (NOT FRIBIDI_FOUND) + endif(NOT MSVC) + + + if (NOT MSVC) + find_package(libunibreak 4.0) + endif(NOT MSVC) + + if (NOT LIBUNIBREAK_FOUND) + message("System libunibreak not found, will build local one\n") + ADD_SUBDIRECTORY(thirdparty/${REPO_LIBUNIBREAK_SRCDIR}) + SET(LIBUNIBREAK_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/${REPO_LIBUNIBREAK_SRCDIR}/src CACHE PATH "" FORCE) + SET(LIBUNIBREAK_LIBRARIES unibreak) + endif (NOT LIBUNIBREAK_FOUND) + + find_package(ZSTD 1.4.0) + if (NOT ZSTD_FOUND) + message("\nSystem zstd not found, will build local one\n") + set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "LEGACY SUPPORT" FORCE) + set(ZSTD_MULTITHREAD_SUPPORT OFF CACHE BOOL "MULTITHREADING SUPPORT" FORCE) + set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "BUILD PROGRAMS" FORCE) + set(ZSTD_BUILD_CONTRIB OFF CACHE BOOL "BUILD CONTRIB" FORCE) + set(ZSTD_BUILD_TESTS OFF CACHE BOOL "BUILD TESTS" FORCE) + set(ZSTD_BUILD_STATIC ON CACHE BOOL "BUILD STATIC LIBRARIES" FORCE) + set(ZSTD_BUILD_SHARED OFF CACHE BOOL "BUILD SHARED LIBRARIES" FORCE) + add_subdirectory(thirdparty/${REPO_ZSTD_SRCDIR}/build/cmake) + SET(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/${REPO_ZSTD_SRCDIR}/lib CACHE PATH "Include directories needed to use ZSTD" FORCE) + SET(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "Libraries needed to link to ZSTD" FORCE) + endif(NOT ZSTD_FOUND) + + find_package(utf8proc) + + if (UTF8PROC_FOUND) + set(DESKTOP_DEFS ${DESKTOP_DEFS} -DUSE_UTF8PROC=1) + else() + set(DESKTOP_DEFS ${DESKTOP_DEFS} -DUSE_UTF8PROC=0) + endif (UTF8PROC_FOUND) + + endif (NOT MAC) + + #if (ENABLE_CHM) + message("Will build patched LIBCHM library\n") + ADD_SUBDIRECTORY(thirdparty_unman/chmlib) + SET(CHM_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty_unman/chmlib/src) + SET(CHM_LIBRARIES chmlib) + ADD_DEFINITIONS(-DCHM_SUPPORT_ENABLED=1) + #else() + #ADD_DEFINITIONS(-DCHM_SUPPORT_ENABLED=0) + #endif(ENABLE_CHM) + + message("Will build patched ANTIWORD library\n") + ADD_DEFINITIONS(-DCR3_ANTIWORD_PATCH=1) + ADD_SUBDIRECTORY(thirdparty_unman/antiword) + SET(ANTIWORD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty_unman/antiword) + SET(ANTIWORD_LIBRARIES antiword) + ADD_DEFINITIONS(-DENABLE_ANTIWORD=1) + INCLUDE_DIRECTORIES( ${ANTIWORD_INCLUDE_DIR} ) endif ( NOT ${GUI} STREQUAL FB2PROPS ) @@ -367,42 +367,42 @@ INCLUDE_DIRECTORIES( ${FRIBIDI_INCLUDE_DIR} ${LIBUNIBREAK_INCLUDE_DIR} ${ZSTD_INCLUDE_DIRS} -) + ) if ( ${GUI} STREQUAL FB2PROPS ) -SET(STD_LIBS - ${ZLIB_LIBRARIES} -) + SET(STD_LIBS + ${ZLIB_LIBRARIES} + ) else() -SET(STD_LIBS - ${JPEG_LIBRARIES} - ${FREETYPE_LIBRARIES} - ${HarfBuzz_LIBRARY} - ${PNG_LIBRARIES} - ${ZLIB_LIBRARIES} - ${CHM_LIBRARIES} - ${ZLIB_LIBRARIES} - ${ANTIWORD_LIBRARIES} - ${FRIBIDI_LIBRARIES} - ${LIBUNIBREAK_LIBRARIES} - ${ZSTD_LIBRARIES} - qimagescale -) -if (FONTCONFIG_FOUND) - set(STD_LIBS ${STD_LIBS} ${FONTCONFIG_LIBRARIES}) -endif (FONTCONFIG_FOUND) -if (UTF8PROC_FOUND) - set(STD_LIBS ${STD_LIBS} ${UTF8PROC_LIBRARIES}) -endif (UTF8PROC_FOUND) -include_directories(${FT_INCLUDE_PATH}) + SET(STD_LIBS + ${JPEG_LIBRARIES} + ${FREETYPE_LIBRARIES} + ${HarfBuzz_LIBRARY} + ${PNG_LIBRARIES} + ${ZLIB_LIBRARIES} + ${CHM_LIBRARIES} + ${ZLIB_LIBRARIES} + ${ANTIWORD_LIBRARIES} + ${FRIBIDI_LIBRARIES} + ${LIBUNIBREAK_LIBRARIES} + ${ZSTD_LIBRARIES} + qimagescale + ) + if (FONTCONFIG_FOUND) + set(STD_LIBS ${STD_LIBS} ${FONTCONFIG_LIBRARIES}) + endif (FONTCONFIG_FOUND) + if (UTF8PROC_FOUND) + set(STD_LIBS ${STD_LIBS} ${UTF8PROC_LIBRARIES}) + endif (UTF8PROC_FOUND) + include_directories(${FT_INCLUDE_PATH}) endif ( ${GUI} STREQUAL FB2PROPS ) include_directories(crengine/include) if ( NOT ${GUI} STREQUAL FB2PROPS ) -include_directories(tinydict) -message("Will make tinydict library - .dict format support") -ADD_SUBDIRECTORY(tinydict) + include_directories(tinydict) + message("Will make tinydict library - .dict format support") + ADD_SUBDIRECTORY(tinydict) endif ( NOT ${GUI} STREQUAL FB2PROPS ) @@ -416,20 +416,20 @@ if ( ${GUI} STREQUAL CRGUI_XCB ) elseif ( ${GUI} STREQUAL CRGUI_NANOX ) message("Will make CR3GUI for NanoX") if (ENABLE_DBUS_VIEWER_EVENTS) - message("Will handle DBUS messages") - pkg_check_modules( DBUS REQUIRED dbus-1 ) - message("dbus include dir: ${DBUS_INCLUDE_DIRS} path ${DBUS_INCLUDE_PATH}") - include_directories(${DBUS_INCLUDE_DIRS}) + message("Will handle DBUS messages") + pkg_check_modules( DBUS REQUIRED dbus-1 ) + message("dbus include dir: ${DBUS_INCLUDE_DIRS} path ${DBUS_INCLUDE_PATH}") + include_directories(${DBUS_INCLUDE_DIRS}) endif (ENABLE_DBUS_VIEWER_EVENTS) ADD_DEFINITIONS( -DLBOOK=1 -DWITH_JINKE=1 -DCR_USE_JINKE=1 - -DJINKE_VIEWER ${CRGUI_DEFS} -DENABLE_UPDATE_MODE_SETTING=1 ) + -DJINKE_VIEWER ${CRGUI_DEFS} -DENABLE_UPDATE_MODE_SETTING=1 ) ADD_SUBDIRECTORY(crengine) ADD_SUBDIRECTORY(cr3gui) elseif ( ${GUI} STREQUAL CRGUI_JINKE_PLUGIN ) message("Will make CR3GUI plugin for Jinke Viewer") ADD_DEFINITIONS( -DLBOOK=1 -DWITH_JINKE=1 -DWITH_JINKE_APP=1 - -DCR_USE_JINKE=1 ${CRGUI_DEFS} - -DENABLE_UPDATE_MODE_SETTING=1 ) + -DCR_USE_JINKE=1 ${CRGUI_DEFS} + -DENABLE_UPDATE_MODE_SETTING=1 ) ADD_SUBDIRECTORY(crengine) ADD_SUBDIRECTORY(cr3gui) elseif ( ${GUI} STREQUAL FB2PROPS ) @@ -465,15 +465,15 @@ elseif ( ${GUI} STREQUAL WX ) elseif ( ${GUI} STREQUAL CRGUI_PB ) message("Will make CR3GUI for PocketBook") ADD_DEFINITIONS( -DLBOOK=1 -DCR_POCKETBOOK=1 - ${CRGUI_DEFS} -DCR_USE_INVERT_FOR_SELECTION_MARKS=1 -DENABLE_UPDATE_MODE_SETTING=1) + ${CRGUI_DEFS} -DCR_USE_INVERT_FOR_SELECTION_MARKS=1 -DENABLE_UPDATE_MODE_SETTING=1) ADD_DEFINITIONS( -DCR_INTERNAL_PAGE_ORIENTATION=0 ) ADD_SUBDIRECTORY(crengine) ADD_SUBDIRECTORY(cr3gui) FIND_PATH (INKVIEW_INCLUDE_DIR inkview.h) IF (INKVIEW_INCLUDE_DIR) - include_directories(${INKVIEW_INCLUDE_DIR}) + include_directories(${INKVIEW_INCLUDE_DIR}) ELSE (INKVIEW_INCLUDE_DIR) - message("inkview.h not found") + message("inkview.h not found") ENDIF (INKVIEW_INCLUDE_DIR) elseif ( ${GUI} STREQUAL CRGUI_QT ) message("Will make CR3GUI with Qt backend")