From 1d12ff4566db925fdac141a7001e9ca44078f074 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 15 Feb 2016 14:43:46 +0100
Subject: [PATCH] Some more cleaning to CMakeLists.txt.

---
 CMakeLists.txt     | 27 +++++++++++++--------------
 src/CMakeLists.txt | 20 ++++++++------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88f2ba3..7d66a37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,23 +46,20 @@ include(CMakePushCheckState)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-if (ENABLE_MBEDTLS)
+if(ENABLE_MBEDTLS)
 	find_package(MbedTLS)
-	if (MBEDTLS_FOUND)
+	if(MBEDTLS_FOUND)
 		message("Use mbedTLS")
 	endif()
-elseif (ENABLE_POLARSSL)
-	find_package(PolarSSL)
-	if (POLARSSL_FOUND)
+endif()
+if(ENABLE_POLARSSL AND NOT MBEDTLS_FOUND)
+	find_package(PolarSSL REQUIRED)
+	if(POLARSSL_FOUND)
 		message("Use polarSSL")
-	else()
-		message(FATAL_ERROR " No polarSSL or mbedTLS found")
 	endif()
-else ()
-	message(FATAL_ERROR "Neither polarSSL nor mbedTLS enabled")
 endif()
 
-if (HAVE_SSL_GET_DTLS_SRTP_PROTECTION_PROFILE)
+if(HAVE_SSL_GET_DTLS_SRTP_PROTECTION_PROFILE)
 	message("DTLS SRTP available")
 	set(HAVE_DTLS_SRTP 1)
 else()
@@ -74,10 +71,11 @@ set(exec_prefix ${prefix}/bin)
 set(libdir ${prefix}/lib)
 set(includedir ${prefix}/include)
 
-if (ENABLE_MBEDTLS AND MBEDTLS_FOUND)
+if(MBEDTLS_FOUND)
 	get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH)
 	set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}")
-elseif(ENABLE_POLARSSL AND POLARSSL_FOUND)
+endif()
+if(POLARSSL_FOUND)
 	get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH)
 	set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${polarssl_library_path} -lpolarssl")
 endif()
@@ -92,9 +90,10 @@ include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-if (ENABLE_MBEDTLS AND MBEDTLS_FOUND)
+if(MBEDTLS_FOUND)
 	include_directories(${MBEDTLS_INCLUDE_DIRS})
-elseif(ENABLE_POLARSSL AND POLARSSL_FOUND)
+endif()
+if(POLARSSL_FOUND)
 	include_directories(${POLARSSL_INCLUDE_DIRS})
 endif()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54e5399..9706a5d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,16 +24,11 @@
 set(BCTOOLBOX_SOURCE_FILES
 )
 
+if(MBEDTLS_FOUND)
+	list(APPEND BCTOOLBOX_SOURCE_FILES crypto_mbedtls.c)
+endif()
 if(POLARSSL_FOUND)
-	set(BCTOOLBOX_SOURCE_FILES
-		${BCTOOLBOX_SOURCE_FILES}
-		crypto_polarssl.c
-	)
-elseif(MBEDTLS_FOUND)
-	set(BCTOOLBOX_SOURCE_FILES
-		${BCTOOLBOX_SOURCE_FILES}
-		crypto_mbedtls.c
-	)
+	list(APPEND BCTOOLBOX_SOURCE_FILES crypto_polarssl.c)
 endif()
 
 if(ENABLE_STATIC)
@@ -53,12 +48,13 @@ else()
 endif()
 
 
+if(MBEDTLS_FOUND)
+	target_include_directories(bctoolbox PUBLIC ${MBEDTLS_INCLUDE_DIRS})
+	target_link_libraries(bctoolbox ${MBEDTLS_LIBRARIES})
+endif()
 if(POLARSSL_FOUND)
 	target_include_directories(bctoolbox PUBLIC ${POLARSSL_INCLUDE_DIRS})
 	target_link_libraries(bctoolbox ${POLARSSL_LIBRARIES})
-elseif(MBEDTLS_FOUND)
-	target_include_directories(bctoolbox PUBLIC ${MBEDTLS_INCLUDE_DIRS})
-	target_link_libraries(bctoolbox ${MBEDTLS_LIBRARIES})
 endif()
 
 
-- 
2.21.0