From 30e5dfab5372f7996efe28b420b86f0f7a9a1f87 Mon Sep 17 00:00:00 2001 From: Mark Jan van Kampen Date: Sat, 16 Jan 2021 11:16:25 +0100 Subject: [PATCH] Only depend on protolib when it is not build with norm --- CMakeLists.txt | 1 + cmake/normConfig.cmake.in | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78eded3..2347393 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,7 @@ if(NOT protokit_FOUND) GIT_TAG ${NORM_PROTOKIT_GIT_TAG} ) FetchContent_MakeAvailable(protokit) + set(NORM_PROTOKIT_INCLUDED 1) endif() # List header files diff --git a/cmake/normConfig.cmake.in b/cmake/normConfig.cmake.in index a9f7552..d54992e 100644 --- a/cmake/normConfig.cmake.in +++ b/cmake/normConfig.cmake.in @@ -4,7 +4,9 @@ include(GNUInstallDirs) include(CMakeFindDependencyMacro) # Same syntax as find_package -find_dependency(protokit REQUIRED) +if(NOT @NORM_PROTOKIT_INCLUDED@) + find_dependency(protokit REQUIRED) +endif() # Add the targets file -include("${CMAKE_CURRENT_LIST_DIR}/normTargets.cmake") \ No newline at end of file +include("${CMAKE_CURRENT_LIST_DIR}/normTargets.cmake")