diff options
Diffstat (limited to 'Build/source/libs/poppler/poppler-src/CMakeLists.txt')
-rw-r--r-- | Build/source/libs/poppler/poppler-src/CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Build/source/libs/poppler/poppler-src/CMakeLists.txt b/Build/source/libs/poppler/poppler-src/CMakeLists.txt index c25e961f878..54294e12828 100644 --- a/Build/source/libs/poppler/poppler-src/CMakeLists.txt +++ b/Build/source/libs/poppler/poppler-src/CMakeLists.txt @@ -22,7 +22,7 @@ if (ECM_FOUND) endif() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "49") +set(POPPLER_MINOR_VERSION "50") set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") @@ -168,13 +168,13 @@ set(USE_OPENJPEG1 FALSE) set(USE_OPENJPEG2 FALSE) set(WITH_OPENJPEG FALSE) if(ENABLE_LIBOPENJPEG STREQUAL "auto") - find_package(LIBOPENJPEG) - set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND}) - set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND}) - if(NOT LIBOPENJPEG_FOUND) - find_package(LIBOPENJPEG2) - set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND}) - set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND}) + find_package(LIBOPENJPEG2) + set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND}) + set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND}) + if(NOT LIBOPENJPEG2_FOUND) + find_package(LIBOPENJPEG) + set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND}) + set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND}) endif() elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg1") find_package(LIBOPENJPEG) @@ -502,7 +502,7 @@ add_library(poppler STATIC ${poppler_SRCS}) else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 65.0.0 SOVERSION 65) +set_target_properties(poppler PROPERTIES VERSION 66.0.0 SOVERSION 66) target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS}) install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) @@ -779,5 +779,5 @@ if(ENABLE_ZLIB_UNCOMPRESS) endif(ENABLE_ZLIB_UNCOMPRESS) if(NOT WITH_OPENJPEG) - message("Warning: Using libopenjpeg is recommended. The internal JPX decoder is unmaintained.") + message("Warning: Using libopenjpeg2 is recommended. The internal JPX decoder is unmaintained.") endif(NOT WITH_OPENJPEG) |