diff options
author | 2020-03-31 11:10:00 +0000 | |
---|---|---|
committer | 2020-03-31 11:10:00 +0000 | |
commit | 23c3bb7400839b664096ad5e16a2346386109bda (patch) | |
tree | d1999acef9f91cd25db9b7c63fd2963cd7ba0e57 /hicn-light/CMakeLists.txt | |
parent | d46e59824bd3fc67abe7bd725965aa454942d640 (diff) | |
parent | 3718e549ee31ac764b327bbf3d6e51dd7e224b46 (diff) |
Merge "[HICN-581] update hicn stack to support windows, again"
Diffstat (limited to 'hicn-light/CMakeLists.txt')
-rw-r--r-- | hicn-light/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt index 1923e7aee..db56feff7 100644 --- a/hicn-light/CMakeLists.txt +++ b/hicn-light/CMakeLists.txt @@ -60,7 +60,11 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) find_package_wrapper(Libhicn REQUIRED) else() if (DISABLE_SHARED_LIBRARIES) - set(HICN_LIBRARIES ${LIBHICN_STATIC} log) + if (WIN32) + set(HICN_LIBRARIES ${LIBHICN_STATIC}) + else () + set(HICN_LIBRARIES ${LIBHICN_STATIC} log) + endif () list(APPEND DEPENDENCIES ${LIBHICN_STATIC} ) @@ -87,11 +91,12 @@ set(HICN_LIGHT_LINK_LIBRARIES ${WINDOWS_LIBRARIES} ) + # Include dirs -- Order does matter! list(APPEND HICN_LIGHT_INCLUDE_DIRS ${HICN_INCLUDE_DIRS} ${LIBPARC_INCLUDE_DIRS} - ${PTHREAD_INCLUDE_DIRS} + ${WINDOWS_INCLUDE_DIRS} ) if (UNIX) |