Allow inclusion of tunnel CMake project in a global CMake project.

a17dfa95 · Ghislain MARY · 4fd951be · a17dfa95 · a17dfa95
Commit a17dfa95 authored Oct 09, 2015 by Ghislain MARY
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +5 -1

cmake/BelleSIPConfig.cmake.in cmake/BelleSIPConfig.cmake.in +5 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,11 @@ if(ENABLE_TLS)
 	endif()
 endif()
 if(ENABLE_TUNNEL)
-	find_package(Tunnel)
+	if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+		include("${EP_tunnel_CONFIG_DIR}/TunnelConfig.cmake")
+	else()
+		find_package(Tunnel)
+	endif()
 	if(TUNNEL_FOUND)
 		set(HAVE_TUNNEL 1)
 	else()

--- a/cmake/BelleSIPConfig.cmake.in
+++ b/cmake/BelleSIPConfig.cmake.in
@@ -33,7 +33,11 @@ if(NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
 endif()

 if(@ENABLE_TUNNEL@)
-	find_package(Tunnel)
+	if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+		include("${EP_tunnel_CONFIG_DIR}/TunnelConfig.cmake")
+	else()
+		find_package(Tunnel)
+	endif()
 endif()

 get_filename_component(BELLESIP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)