[poppler] cmake/modules
cmake/modules/FindLCMS.cmake | 84 ---
1 file changed, 84 deletions(-)
New commits:
commit f47c25939e8ef6ee995d312bac219791fc5b0236
Author: Albert Astals Cid
Date: Tue Oct 23 00:02:56 2018 +0200
We don't need the LCMS find module anymore
We only support lcms2 for a while
diff --git a/cmake/modules/FindLCMS.cmake b/cmake/modules/FindLCMS.cmake
deleted file mode 100644
index 9d162d2c..
--- a/cmake/modules/FindLCMS.cmake
+++ /dev/null
@@ -1,84 +0,0 @@
-# - Find LCMS
-# Find the LCMS includes and library
-# This module defines
-# LCMS_INCLUDE_DIR, where to find lcms.h
-# LCMS_LIBRARIES, the libraries needed to use LCMS.
-# LCMS_VERSION, The value of LCMS_VERSION defined in lcms.h
-# LCMS_FOUND, If false, do not try to use LCMS.
-
-
-# Copyright (c) 2008, Adrian Page,
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-if(NOT WIN32)
- find_package(PkgConfig)
- pkg_check_modules(PC_LCMS lcms)
- set(LCMS_DEFINITIONS ${PC_LCMS_CFLAGS_OTHER})
-endif(NOT WIN32)
-
-find_path(LCMS_INCLUDE_DIR lcms.h
- PATHS
- ${PC_LCMS_INCLUDEDIR}
- ${PC_LCMS_INCLUDE_DIRS}
- PATH_SUFFIXES lcms liblcms1
-)
-
-find_library(LCMS_LIBRARIES NAMES lcms liblcms lcms-1 liblcms-1
- PATHS
- ${PC_LCMS_LIBDIR}
- ${PC_LCMS_LIBRARY_DIRS}
- PATH_SUFFIXES lcms
-)
-
-if(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES)
- set(LCMS_FOUND TRUE)
-else(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES)
- set(LCMS_FOUND FALSE)
-endif(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES)
-
-if(LCMS_FOUND)
- set(FIND_LCMS_VERSION_SOURCE
- "#include \n int main()\n {\n return LCMS_VERSION;\n }\n")
- set(FIND_LCMS_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLCMS.cxx)
- file(WRITE "${FIND_LCMS_VERSION_SOURCE_FILE}" "${FIND_LCMS_VERSION_SOURCE}")
-
- set(FIND_LCMS_VERSION_ADD_INCLUDES
- "-DINCLUDE_DIRECTORIES:STRING=${LCMS_INCLUDE_DIR}")
-
- try_run(LCMS_VERSION LCMS_COMPILE_RESULT
- ${CMAKE_BINARY_DIR}
- ${FIND_LCMS_VERSION_SOURCE_FILE}
- CMAKE_FLAGS "${FIND_LCMS_VERSION_ADD_INCLUDES}"
- OUTPUT_VARIABLE OUTPUT)
-
- if(LCMS_COMPILE_RESULT AND NOT LCMS_VERSION STREQUAL FAILED_TO_RUN)
- if(NOT LCMS_FIND_QUIETLY)
- string(SUBSTRING ${LCMS_VERSION} 0 1 LCMS_MAJOR_VERSION)
- string(SUBSTRING ${LCMS_VERSION} 1 2 LCMS_MINOR_VERSION)
- message(STATUS "Found lcms version
${LCMS_MAJOR_VERSION}.${LCMS_MINOR_VERSION}, ${LCMS_LIBRARIES}")
- endif(NOT LCMS_FIND_QUIETLY)
- else(LCMS_COMPILE_RESULT AND NOT LCMS_VERSION STREQUAL FAILED_TO_RUN)
- if(NOT LCMS_FIND_QUIETLY)
- message(STATUS "Found lcms but failed to find version
${LCMS_LIBRARIES}")
- file(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
-"Find lcms version failed with the following
output:\n${OUTPUT}\nFindLCMS.cxx:\n${FIND_LCMS_VERSION_SOURCE}\n\n")
- endif(NOT LCMS_FIND_QUIETLY)
- set(LCMS_VERSION NOTFOUND)
- endif(LCMS_COMPILE_RESULT AND NOT LCMS_VERSION STREQUAL FAILED_TO_RUN)
-else(LCMS_FOUND)
- if(NOT LCMS_FIND_QUIETLY)
- if(LCMS_FIND_REQUIRED)
- message(FATAL_ERROR "Required package lcms NOT found")
- else(LCMS_FIND_REQUIRED)
- message(STATUS "lcms NOT found")
- endif(LCMS_FIND_REQUIRED)
- endif(NOT LCMS_FIND_QUIETLY)
-endif(LCMS_FOUND)
-
-mark_as_advanced(LCMS_INCLUDE_DIR LCMS_LIBRARIES LCMS_VERSION)
-
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] Poppler 0.70.1 released
Available from http://poppler.freedesktop.org/poppler-0.70.1.tar.xz The tarball is signed at http://poppler.freedesktop.org/poppler-0.70.1.tar.xz.sig with my key http://keyserver.opensuse.org:11371/pks/lookup?search=0xCA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7=on=vindex Release 0.70.1 glib: * Install missing file This release was brought to you by Christian Persch Testing, patches and bug reports welcome. Cheers, Albert ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] Changes to 'refs/tags/poppler-0.70.1'
Tag 'poppler-0.70.1' created by Albert Astals Cid at 2018-10-22 19:53 + 0.70.1 Changes since poppler-0.70.0-2: --- 0 files changed --- ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] CMakeLists.txt cpp/Doxyfile NEWS qt5/src
CMakeLists.txt |2 +-
NEWS |4
cpp/Doxyfile |2 +-
qt5/src/Doxyfile |2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 3867958e84a7a136e5e86157617a3fc64988ee69
Author: Albert Astals Cid
Date: Mon Oct 22 21:49:34 2018 +0200
0.70.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96388a98..3ad655bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "70")
-set(POPPLER_MICRO_VERSION "0")
+set(POPPLER_MICRO_VERSION "1")
set(POPPLER_VERSION
"${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
set (CMAKE_CXX_STANDARD 14)
diff --git a/NEWS b/NEWS
index b60f74d9..e9190700 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Release 0.70.1
+glib:
+ * Install missing file
+
Release 0.70.0
core:
* FreeText annotations: default to font from default appearance string
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 137ac3f5..2e468f9c 100644
--- a/cpp/Doxyfile
+++ b/cpp/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler CPP"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.70.0
+PROJECT_NUMBER = 0.70.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile
index 031796e8..0d91486b 100644
--- a/qt5/src/Doxyfile
+++ b/qt5/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.70.0
+PROJECT_NUMBER = 0.70.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
[poppler] glib/CMakeLists.txt
glib/CMakeLists.txt |1 + 1 file changed, 1 insertion(+) New commits: commit 0e012fcdc3258fe788cf53053bb1fe33846285f1 Author: Christian Persch Date: Mon Oct 22 18:33:38 2018 +0200 glib: Install missing header https://gitlab.freedesktop.org/poppler/poppler/issues/647 diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index 97317f03..beae865a 100644 --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -31,6 +31,7 @@ set(poppler_glib_public_headers poppler-form-field.h poppler-annot.h poppler-layer.h + poppler-macros.h poppler-movie.h poppler-media.h poppler.h ___ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler
