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 --- ctrl/libhicnctrl/CMakeLists.txt | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'ctrl/libhicnctrl/CMakeLists.txt') diff --git a/ctrl/libhicnctrl/CMakeLists.txt b/ctrl/libhicnctrl/CMakeLists.txt index 08441075b..d0a4bbef3 100644 --- a/ctrl/libhicnctrl/CMakeLists.txt +++ b/ctrl/libhicnctrl/CMakeLists.txt @@ -33,22 +33,29 @@ set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_MACOSX_RPATH ON) + +set(LIBHICNCTRL hicnctrl) + +if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") + set(LIBHICNCTRL ${LIBHICNCTRL}-memif PARENT_SCOPE) + set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs") + list(APPEND HICN_LIBRARIES ${HICNPLUGIN_LIBRARIES}) +endif() + +set(LIBHICNCTRL ${LIBHICNCTRL} CACHE INTERNAL "" FORCE) +set(LIBHICNCTRL_SHARED ${LIBHICNCTRL}.shared CACHE INTERNAL "" FORCE) +set(LIBHICNCTRL_STATIC ${LIBHICNCTRL}.static CACHE INTERNAL "" FORCE) +set(HICNCTRL hicnctrl CACHE INTERNAL "" FORCE) +set(LIBHICNCTRL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes CACHE INTERNAL "" FORCE) + if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) - set(HICNCTRL hicnctrl) - set(LIBHICNCTRL hicnctrl) if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - set(LIBHICNCTRL ${LIBHICNCTRL}-memif) find_package_wrapper(HicnPlugin REQUIRED) - list(APPEND HICN_LIBRARIES ${HICNPLUGIN_LIBRARIES}) - set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs") endif() find_package_wrapper(Libhicn REQUIRED) list(APPEND HICN_LIBRARIES ${LIBHICN_SHARED}) - set(LIBHICNCTRL_SHARED ${LIBHICNCTRL}.shared) - set(LIBHICNCTRL_STATIC ${LIBHICNCTRL}.static) - set(HICN_INCLUDE_DIRS ${HICN_INCLUDE_DIRS} ${HICNPLUGIN_INCLUDE_DIRS}) @@ -60,12 +67,11 @@ else() ${LIBHICN_STATIC} ) elseif (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - set(HICN_INCLUDE_DIRS - ${HICN_INCLUDE_DIRS} - ${HICNPLUGIN_INCLUDE_DIRS}) - - set(HICN_LIBRARIES ${HICNPLUGIN_LIBRARIES}) - set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs") + set( + HICN_INCLUDE_DIRS + ${HICN_INCLUDE_DIRS} + ${HICNPLUGIN_INCLUDE_DIRS} + ) list(APPEND DEPENDENCIES hicn_plugin -- cgit 1.2.3-korg