diff options
| author |   Angelo Mantellini <angelo.mantellini@cisco.com> | 2020-03-31 11:10:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2020-03-31 11:10:00 +0000 |
| commit | 23c3bb7400839b664096ad5e16a2346386109bda (patch) | |
| tree | d1999acef9f91cd25db9b7c63fd2963cd7ba0e57 /ctrl | |
| parent | d46e59824bd3fc67abe7bd725965aa454942d640 (diff) | |
| parent | 3718e549ee31ac764b327bbf3d6e51dd7e224b46 (diff) | |
Merge "[HICN-581] update hicn stack to support windows, again"
Diffstat (limited to 'ctrl')
| -rw-r--r-- | ctrl/facemgr/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/CMakeLists.txt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ctrl/facemgr/CMakeLists.txt b/ctrl/facemgr/CMakeLists.txt index a1cd48bbd..4290d9cd6 100644 --- a/ctrl/facemgr/CMakeLists.txt +++ b/ctrl/facemgr/CMakeLists.txt @@ -70,7 +70,11 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) find_package_wrapper(Libhicnctrl 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 () set(LIBHICNCTRL_LIBRARIES ${LIBHICNCTRL_STATIC}) list(APPEND DEPENDENCIES ${LIBHICN_STATIC} diff --git a/ctrl/libhicnctrl/CMakeLists.txt b/ctrl/libhicnctrl/CMakeLists.txt index 15425b513..b2c5975be 100644 --- a/ctrl/libhicnctrl/CMakeLists.txt +++ b/ctrl/libhicnctrl/CMakeLists.txt @@ -64,7 +64,11 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) 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} ) |