From: Daniel Gryniewicz <dang@fprintf.net>
Date: Mon, 21 Sep 2015 14:57:26 +0000 (-0400)
Subject: CMake - fix check for NSS
X-Git-Tag: v9.1.0~84^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcf647ec0433ababe54b774179ab427a1fcb1883;p=ceph.git

CMake - fix check for NSS

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a96a57a4fe36..a5d0182b8c07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,7 +184,7 @@ if(CRYPTOPP_FOUND)
 	set(USE_NSS 0)
 else()
         MESSAGE(STATUS "Cryptopp not found using NSS instead")
-        find_package(NSS)
+	find_package(NSS REQUIRED)
         if(NSS_FOUND)
 		set(USE_NSS 1)
 		set(USE_CRYPTOPP 0)
diff --git a/cmake/modules/FindNSS.cmake b/cmake/modules/FindNSS.cmake
index e42907c1a0b9..8129980ab8fc 100644
--- a/cmake/modules/FindNSS.cmake
+++ b/cmake/modules/FindNSS.cmake
@@ -25,7 +25,7 @@ else (NSS_LIBRARIES AND NSS_INCLUDE_DIRS)
 
   find_path(NSS_INCLUDE_DIR
     NAMES
-      nss.h
+      pk11pub.h
     PATHS
       ${_NSS_INCLUDEDIR}
       /usr/include
@@ -114,6 +114,8 @@ else (NSS_LIBRARIES AND NSS_INCLUDE_DIRS)
   endif (NSSUTIL3_LIBRARY)
 
   include(FindPackageHandleStandardArgs)
+  message(STATUS "NSS_LIBRARIES: ${NSS_LIBRARIES}")
+  message(STATUS "NSS_INCLUDE_DIRS: ${NSS_INCLUDE_DIRS}")
   find_package_handle_standard_args(NSS DEFAULT_MSG NSS_LIBRARIES NSS_INCLUDE_DIRS)
 
   # show the NSS_INCLUDE_DIRS and NSS_LIBRARIES variables only in the advanced view