BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Only depend on protolib when it is not build with norm" 

This reverts commit 30e5dfab53.
pull/15/head
Mark Jan van Kampen 2021-01-16 11:24:15 +01:00
parent 30e5dfab53
commit facc70ce29
No known key found for this signature in database
GPG Key ID: 942C8E0E0D996934
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -45,7 +45,6 @@ if(NOT protokit_FOUND)
GIT_TAG ${NORM_PROTOKIT_GIT_TAG} GIT_TAG ${NORM_PROTOKIT_GIT_TAG}
) )
FetchContent_MakeAvailable(protokit) FetchContent_MakeAvailable(protokit)
set(NORM_PROTOKIT_INCLUDED 1)
endif() endif()
# List header files # List header files

6
cmake/normConfig.cmake.in
View File

@ -4,9 +4,7 @@ include(GNUInstallDirs)
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
# Same syntax as find_package # Same syntax as find_package
if(NOT @NORM_PROTOKIT_INCLUDED@) find_dependency(protokit REQUIRED)
find_dependency(protokit REQUIRED)
endif()
# Add the targets file # Add the targets file
include("${CMAKE_CURRENT_LIST_DIR}/normTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/normTargets.cmake")