diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-12-06 18:25:28 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2019-12-10 17:50:49 +0100 |
| commit | 3f21100e1d2ec47b64670a8b08d0c9d067bf9ef3 (patch) | |
| tree | 6774ce7f2bc020b646366503eaa6acf2f0af13eb /apps | |
| parent | e8eda2c819b36555d9d6b080eaf8b4b1109d7646 (diff) | |
[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 <msardara@cisco.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index c74be92ba..1778ba557 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -25,11 +25,12 @@ set(CMAKE_MODULE_PATH include(BuildMacros) include(WindowsMacros) +set(HICN_APPS hicn-apps CACHE INTERNAL "" FORCE) + if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) find_package(Libtransport REQUIRED) find_package(Threads REQUIRED) include_directories(${LIBTRANSPORT_INCLUDE_DIRS}) - set(HICN_APPS hicn-apps) else() if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") find_package(OpenSSL REQUIRED) @@ -38,6 +39,7 @@ else() else () set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED}) endif () + list(APPEND DEPENDENCIES ${LIBTRANSPORT_LIBRARIES} ) |