From 0f3841ea94ed9019a538516d774f5936b301e9a0 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Wed, 10 Jun 2020 10:44:43 +0200 Subject: [HICN-627] CMake fix: consider local header files first and system ones after. Signed-off-by: Mauro Sardara Change-Id: I361c8e4f995dad976cc717c5027bcacdb2ba65f5 Signed-off-by: Mauro Sardara --- libtransport/CMakeLists.txt | 2 +- libtransport/src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libtransport') 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} ) -- cgit 1.2.3-korg