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