diff options
author | Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
---|---|---|
committer | Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
commit | 229385955109b866a23c4ac2aa03d4d11044c39d (patch) | |
tree | 0591f9c2fc4144d62330337cc2b94c63dfeded54 /hicn-light/CMakeLists.txt | |
parent | 6ffbb5ed61733b8dbef39b1a9d437e899e9359d7 (diff) |
[HICN-708] Rebase with master
Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159
Diffstat (limited to 'hicn-light/CMakeLists.txt')
-rw-r--r-- | hicn-light/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt index fa8c6664e..33caa5cdc 100644 --- a/hicn-light/CMakeLists.txt +++ b/hicn-light/CMakeLists.txt @@ -75,7 +75,7 @@ else() ${LIBHICNCTRL_STATIC} ) else () - set(HICN_LIBRARIES ${LIBHICN_SHARED}) + set(HICN_LIBRARIES ${LIBHICN_SHARED} ${LIBHICNCTRL_SHARED}) list(APPEND DEPENDENCIES ${LIBEVENT_SHARED} ${LIBHICN_SHARED} @@ -123,8 +123,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") endif() if (BUILD_TESTS) - include (GTestImport) - if(${CMAKE_VERSION} VERSION_GREATER "3.10.0") include (GoogleTest) else() |