diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2020-06-10 10:44:43 +0200 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2020-06-10 11:59:07 +0200 |
| commit | 0f3841ea94ed9019a538516d774f5936b301e9a0 (patch) | |
| tree | b68ebb2df24f052e3e7c295fca1fe5d3c26e4a5e | |
| parent | 6644390d4058f40680a4710c92ab6e2f7853b21c (diff) | |
[HICN-627] CMake fix: consider local header files first and system ones after.
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I361c8e4f995dad976cc717c5027bcacdb2ba65f5
Signed-off-by: Mauro Sardara <msardara@cisco.com>
| -rw-r--r-- | libtransport/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libtransport/src/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index 67492cb11..16c28f390 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -146,9 +146,9 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") endif () list(APPEND LIBRARIES + ${HICN_LIBRARIES} ${LIBPARC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} - ${HICN_LIBRARIES} ${VPP_LIBRARIES} ${ANDROID_LIBRARIES} ${OPENSSL_LIBRARIES} diff --git a/libtransport/src/CMakeLists.txt b/libtransport/src/CMakeLists.txt index c92393775..c10f3da5a 100644 --- a/libtransport/src/CMakeLists.txt +++ b/libtransport/src/CMakeLists.txt @@ -67,7 +67,7 @@ if (DISABLE_SHARED_LIBRARIES) LINK_LIBRARIES ${LIBRARIES} DEPENDS ${DEPENDENCIES} COMPONENT lib${LIBTRANSPORT} - INCLUDE_DIRS ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} ${LIBTRANSPORT_INCLUDE_DIRS} + INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} INSTALL_ROOT_DIR hicn/transport DEFINITIONS ${COMPILER_DEFINITIONS} ) @@ -79,7 +79,7 @@ else () LINK_LIBRARIES ${LIBRARIES} DEPENDS ${DEPENDENCIES} COMPONENT lib${LIBTRANSPORT} - INCLUDE_DIRS ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} ${LIBTRANSPORT_INCLUDE_DIRS} + INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} ${LIBTRANSPORT_INTERNAL_INCLUDE_DIRS} INSTALL_ROOT_DIR hicn/transport DEFINITIONS ${COMPILER_DEFINITIONS} ) |