From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Jun 2016 18:22:30 +0000 (-0400)
Subject: CMakeLists: nss only, ignore cryptopp
X-Git-Tag: v11.0.1~916^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=74ec4f94b1b5a69d20d36ea3869c5e5715a7590c;p=ceph-ci.git

CMakeLists: nss only, ignore cryptopp

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea937f10cd5..a3a76666b49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -284,26 +284,19 @@ find_package(libuuid REQUIRED)
 
 find_package(libcurl REQUIRED)
 
-option(USE_CRYPTOPP "Cryptopp is ON" ON)
-find_package(cryptopp)
-if(CRYPTOPP_FOUND)
-        MESSAGE(STATUS "${CRYPTOPP_LIBRARIES}")
-        set(CRYPTO_LIBS ${CRYPTOPP_LIBRARIES})
-	set(USE_NSS 0)
-else()
-        MESSAGE(STATUS "Cryptopp not found using NSS instead")
-	find_package(NSS REQUIRED)
-        if(NSS_FOUND)
-		set(USE_NSS 1)
-		set(USE_CRYPTOPP 0)
-		find_package(NSPR)
-		if(NSPR_FOUND)
-			set(CRYPTO_LIBS ${NSS_LIBRARIES} ${NSPR_LIBRARIES})
-			#MESSAGE(STATUS "${CRYPTO_LIBS}")
-			#MESSAGE(STATUS "${NSS_INCLUDE_DIR} ${NSPR_INCLUDE_DIR}")
-		endif(NSPR_FOUND)
-	endif(NSS_FOUND)
-endif(CRYPTOPP_FOUND)
+# nss or cryptopp?
+#  (dropped cryptopp support for now, feel free to add it back -sage)
+find_package(NSS REQUIRED)
+if(NSS_FOUND)
+	set(USE_NSS 1)
+	find_package(NSPR)
+	if(NSPR_FOUND)
+		set(CRYPTO_LIBS ${NSS_LIBRARIES} ${NSPR_LIBRARIES})
+		#MESSAGE(STATUS "${CRYPTO_LIBS}")
+		#MESSAGE(STATUS "${NSS_INCLUDE_DIR} ${NSPR_INCLUDE_DIR}")
+	endif(NSPR_FOUND)
+endif(NSS_FOUND)
+
 
 option(WITH_XIO "Enable XIO messaging" OFF)
 if(WITH_XIO)