[poppler] cmake/modules

[GitLab Mirror]

 cmake/modules/FindNSS3.cmake |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 66100be4fa629d03634c6461c084a72926473ce8
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jan 17 23:25:20 2022 +0100

    FindNSS3: Improve documentation and remove "wrong" MSVC check

diff --git a/cmake/modules/FindNSS3.cmake b/cmake/modules/FindNSS3.cmake
index c0820b26..9945a689 100644
--- a/cmake/modules/FindNSS3.cmake
+++ b/cmake/modules/FindNSS3.cmake
@@ -2,21 +2,22 @@
 # Once done this will define
 #
 #  NSS_FOUND - system has NSS3
-#  NSS3_CFLAGS - the NSS CFlags
-#  NSS3_LIBRARIES - Link these to use NSS
+#  PkgConfig::NSS3 - Use this in target_link_libraries to bring both includes and link libraries
+#
+#  Deprecated, use the above variables:
+#     NSS3_CFLAGS - the NSS CFlags
+#     NSS3_LIBRARIES - Link these to use NSS
 #
 # Copyright 2015 André Guerreiro, <aguerreiro1985 at gmail.com>
+# Copyright 2022 Albert Astals Cid, <aacid at kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 include(FindPackageHandleStandardArgs)
 
-if (NOT MSVC)
-  find_package(PkgConfig REQUIRED)
-
-  pkg_check_modules(NSS3 IMPORTED_TARGET "nss>=3.19")
+find_package(PkgConfig REQUIRED)
 
-  find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LIBRARIES NSS3_CFLAGS)
+pkg_check_modules(NSS3 IMPORTED_TARGET "nss>=3.19")
 
-endif(NOT MSVC)
+find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LIBRARIES NSS3_CFLAGS)