Merge pull request #275 from dbear496/fix-cmake-with-rnp

fix CMake build with RNP

Author: csoler

CMakeLists.txt

@@ -47,6 +47,11 @@ cmake_dependent_option(
 	"RS_BITDHT_STUNNER"
 	OFF )
 
+option(
+	RS_RNPLIB
+	"Enable use RNP lib for PGP"
+	ON )
+
 option(
 	RS_JSON_API
 	"Use restbed to expose libretroshare as JSON API via HTTP"
@@ -291,25 +296,48 @@ target_link_libraries(${PROJECT_NAME} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 
 ################################################################################
 
-set(OPENPGPSDK_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../openpgpsdk/")
-if(EXISTS "${OPENPGPSDK_DEVEL_DIR}/CMakeLists.txt" )
-	message(
-		STATUS
-		"openpgpsdk source found at ${OPENPGPSDK_DEVEL_DIR} using it" )
-	add_subdirectory("${OPENPGPSDK_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/openpgpsdk")
-else()
-	FetchContent_Declare(
-		openpgpsdk
-		GIT_REPOSITORY "https://github.com/RetroShare/OpenPGP-SDK.git"
-		GIT_TAG "origin/master"
-		GIT_SHALLOW TRUE
-		GIT_PROGRESS TRUE
-		TIMEOUT 10
+if(RS_RNPLIB)
+	# Add RNP build directories to linker search path
+	target_link_directories(${PROJECT_NAME} PRIVATE
+		${CMAKE_CURRENT_BINARY_DIR}/../supportlibs/librnp/Build/src/lib
+		${CMAKE_CURRENT_BINARY_DIR}/../supportlibs/librnp/Build/src/libsexpp
+	)
+
+	# Link libraries by name, including RNP libs and dependencies first
+	target_link_libraries(${PROJECT_NAME} PRIVATE
+		rnp             # Link by name
+		sexpp
 	)
-	FetchContent_MakeAvailable(openpgpsdk)
-endif()
 
-target_link_libraries(${PROJECT_NAME} PRIVATE openpgpsdk)
+	target_include_directories(${PROJECT_NAME} PUBLIC
+		"${CMAKE_CURRENT_SOURCE_DIR}/../supportlibs/librnp/include"
+		"${CMAKE_CURRENT_BINARY_DIR}/../supportlibs/librnp/Build/src/lib"
+	)
+else()
+
+	set(OPENPGPSDK_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../openpgpsdk/")
+	if(EXISTS "${OPENPGPSDK_DEVEL_DIR}/CMakeLists.txt" )
+		message(
+			STATUS
+			"openpgpsdk source found at ${OPENPGPSDK_DEVEL_DIR} using it" )
+		add_subdirectory("${OPENPGPSDK_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/openpgpsdk")
+	else()
+		FetchContent_Declare(
+			openpgpsdk
+			GIT_REPOSITORY "https://github.com/RetroShare/OpenPGP-SDK.git"
+			GIT_TAG "origin/master"
+			GIT_SHALLOW TRUE
+			GIT_PROGRESS TRUE
+			TIMEOUT 10
+		)
+		FetchContent_MakeAvailable(openpgpsdk)
+	endif()
+
+	target_link_libraries(${PROJECT_NAME} PRIVATE openpgpsdk)
+
+	target_compile_definitions(${PROJECT_NAME} PUBLIC USE_OPENPGPSDK)
+
+endif(RS_RNPLIB)
 
 ################################################################################
 
@@ -337,7 +365,7 @@ if(RS_BITDHT)
 
 	target_compile_definitions(${PROJECT_NAME} PUBLIC RS_USE_BITDHT)
 	target_link_libraries(${PROJECT_NAME} PRIVATE bitdht)
-	
+
 	if(RS_BITDHT_STUNNER)
 		target_compile_definitions(${PROJECT_NAME} PUBLIC RS_USE_DHT_STUNNER)
 
@@ -397,7 +425,7 @@ if(RS_JSON_API)
 	set(
 		JSONAPI_GENERATOR_SOURCE_DIR
 		"${CMAKE_CURRENT_SOURCE_DIR}/src/jsonapi/" )
-		
+
 	set(
 		JSONAPI_GENERATOR_EXECUTABLE
 		"${JSONAPI_GENERATOR_SOURCE_DIR}/jsonapi-generator.py" )
@@ -457,6 +485,7 @@ if(RS_JSON_API)
 
 		target_include_directories(
 			${PROJECT_NAME} PRIVATE "${RESTBED_DEVEL_DIR}/source/" )
+		target_link_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/../supportlibs/restbed")
 		target_link_libraries(${PROJECT_NAME} PRIVATE restbed)
 	else()
 		message( WARNING
@@ -598,7 +627,7 @@ endif(NOT RS_WARN_DEPRECATED)
 
 if(RS_WARN_LESS)
 	target_compile_definitions(${PROJECT_NAME} PRIVATE RS_NO_WARN_CPP)
-	
+
 	target_compile_options(
 		${PROJECT_NAME} PRIVATE
 		-Wno-cpp -Wno-inconsistent-missing-override )

src/CMakeLists.txt

@@ -230,21 +230,25 @@ endif(RS_JSON_API)
 
 list(
 	APPEND RS_SOURCES
-	pgp/openpgpsdkhandler.cc
 	pgp/pgpauxutils.cc
 	pgp/pgphandler.cc
 	pgp/pgpkeyutil.cc
-	pgp/rscertificate.cc
-	pgp/rnppgphandler.cc )
+	pgp/rscertificate.cc )
 
 list(
 	APPEND RS_IMPLEMENTATION_HEADERS
-	pgp/openpgpsdkhandler.h
 	pgp/pgpauxutils.h
 	pgp/pgphandler.h
 	pgp/pgpkeyutil.h
-	pgp/rscertificate.h
-	pgp/rnppgphandler.h )
+	pgp/rscertificate.h )
+
+if(RS_RNPLIB)
+	list(APPEND RS_SOURCES pgp/rnppgphandler.cc)
+	list(APPEND RS_IMPLEMENTATION_HEADERS pgp/rnppgphandler.h)
+else()
+	list(APPEND RS_SOURCES pgp/openpgpsdkhandler.cc)
+	list(APPEND RS_IMPLEMENTATION_HEADERS pgp/openpgpsdkhandler.h)
+endif()
 
 #./plugins/dlfcn_win32.cc
 #./plugins/dlfcn_win32.h