cmake/modules/FindNSS3.cmake | 4 ++-- glib/CMakeLists.txt | 2 +- utils/pdfsig.cc | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 0e8effb2c5143548f4245300840a510eaf94f9e7 Author: Alexey Pavlov <[email protected]> Date: Mon Dec 10 12:03:48 2018 +0100 msys2: add missing include on mingw-w64 diff --git a/utils/pdfsig.cc b/utils/pdfsig.cc index 091ffdcb..82c0616b 100644 --- a/utils/pdfsig.cc +++ b/utils/pdfsig.cc @@ -11,6 +11,7 @@ // Copyright 2017 Hans-Ulrich Jüttner <[email protected]> // Copyright 2017 Adrian Johnson <[email protected]> // Copyright 2018 Chinmoy Ranjan Pradhan <[email protected]> +// Copyright 2019 Alexey Pavlov <[email protected]> // //======================================================================== @@ -35,6 +36,7 @@ #include "SignatureInfo.h" #include "Win32Console.h" #include "numberofcharacters.h" +#include <libgen.h> static const char * getReadableSigState(SignatureValidationStatus sig_vs) { commit 12cf140b0e3b241788b6dfd65129d9bb028bef9c Author: Alexey Pavlov <[email protected]> Date: Mon Dec 10 01:07:07 2018 +0100 msys2: fix glib introspection path on mingw-w64 diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index 6958caf6..426f3a91 100644 --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -130,7 +130,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) set(Poppler_0_18_gir_INCLUDES GObject-2.0 Gio-2.0 cairo-1.0) get_directory_property(_tmp_includes INCLUDE_DIRECTORIES) _list_prefix(_includes _tmp_includes "-I") - set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR}) + set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR}) set(Poppler_0_18_gir_LIBS poppler-glib) _list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/") list(APPEND _abs_introspection_files commit 859b4e54c8a6af13eb4715076dc90a17bb2b71df Author: Alexey Pavlov <[email protected]> Date: Mon Dec 10 01:06:18 2018 +0100 msys2: support enabling NSS on mingw-w64 diff --git a/cmake/modules/FindNSS3.cmake b/cmake/modules/FindNSS3.cmake index 657cad88..13876290 100644 --- a/cmake/modules/FindNSS3.cmake +++ b/cmake/modules/FindNSS3.cmake @@ -12,11 +12,11 @@ include(FindPackageHandleStandardArgs) -if (NOT WIN32) +if (NOT MSVC) find_package(PkgConfig REQUIRED) pkg_check_modules(NSS3 "nss>=3.19") find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LIBRARIES NSS3_CFLAGS) -endif(NOT WIN32) +endif(NOT MSVC) _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
