From 3f21100e1d2ec47b64670a8b08d0c9d067bf9ef3 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Fri, 6 Dec 2019 18:25:28 +0100 Subject: [HICN-430] Rework on CMake Change way targets are defined: each project defines targets. Fix project BUILD flags Add build-extras bash script Rework build tree of extras folder, using ExternalProject_Add Change-Id: I82fa29896e54c8a033490eba013c3f0431bec9d0 Signed-off-by: Mauro Sardara --- lib/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 4df09c0dd..3cc40bb7f 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -26,10 +26,10 @@ if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") endif() -if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) - set(LIBHICN hicn) - set(LIBHICN_STATIC ${LIBHICN}.static) -endif() +set(LIBHICN hicn CACHE INTERNAL "" FORCE) +set(LIBHICN_SHARED ${LIBHICN}.shared CACHE INTERNAL "" FORCE) +set(LIBHICN_STATIC ${LIBHICN}.static CACHE INTERNAL "" FORCE) +set(HICN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes CACHE INTERNAL "" FORCE) include (Packaging) -- cgit 1.2.3-korg