diff options
| author |   Angelo Mantellini <manangel@cisco.com> | 2021-04-30 12:26:57 +0200 |
|---|---|---|
| committer |   Angelo Mantellini <angelo.mantellini@cisco.com> | 2021-04-30 14:54:00 +0200 |
| commit | 07133ac060c2af721941f7b47c52c075df3168ba (patch) | |
| tree | a3a618442fc9f1adb5f1cf2e3d442c70fd787d2b /cmake | |
| parent | 39e15ebb3805efb6c71a1dd16f18061cd86487cf (diff) | |
[HICN-703] Update windows-sdk and hicn code
Signed-off-by: Angelo Mantellini <@ngelo.mantellini@cisco.com>
Change-Id: I05e4c92ce7de3640f0272afae127e1377862bd3e
Signed-off-by: Angelo Mantellini <angelo.mantellini@cisco.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/BuildMacros.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/FindLibconfig++.cmake | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmake/Modules/BuildMacros.cmake b/cmake/Modules/BuildMacros.cmake index 4c55f32fe..8914d904d 100644 --- a/cmake/Modules/BuildMacros.cmake +++ b/cmake/Modules/BuildMacros.cmake @@ -264,6 +264,8 @@ macro (build_module module) set(LINK_FLAGS "-Wl,-undefined,dynamic_lookup") elseif(${CMAKE_SYSTEM_NAME} MATCHES Linux) set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-all") + elseif(${CMAKE_SYSTEM_NAME} MATCHES Windows) + set(LINK_FLAGS "/wd4275") else() message(FATAL_ERROR "Trying to build module on a not supportd platform. Aborting.") endif() diff --git a/cmake/Modules/FindLibconfig++.cmake b/cmake/Modules/FindLibconfig++.cmake index 865f75078..8dfc5fbe8 100644 --- a/cmake/Modules/FindLibconfig++.cmake +++ b/cmake/Modules/FindLibconfig++.cmake @@ -14,13 +14,13 @@ find_path(LIBCONFIG_INCLUDE_DIR libconfig.h++ if (WIN32) if(CMAKE_SIZEOF_VOID_P EQUAL 8) - find_library(LIBCONFIG_LIBRARY NAMES libconfig.lib + find_library(LIBCONFIG_CPP_LIBRARIES NAMES libconfig++.lib HINTS ${LIBCONFIG_SEARCH_PATH_LIST} PATH_SUFFIXES lib/x64 DOC "Find the libconfig libraries" ) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) - find_library(LIBCONFIG_LIBRARY NAMES libconfig.lib + find_library(LIBCONFIG_CPP_LIBRARIES NAMES libconfig++.lib HINTS ${LIBCONFIG_SEARCH_PATH_LIST} PATH_SUFFIXES lib/x32 DOC "Find the libconfig libraries" @@ -40,4 +40,5 @@ set(LIBCONFIG_INCLUDE_DIRS ${LIBCONFIG_INCLUDE_DIR}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libconfig++ LIBCONFIG_CPP_LIBRARIES LIBCONFIG_INCLUDE_DIRS) + mark_as_advanced(LIBCONFIG_CPP_LIBRARIES LIBCONFIG_INCLUDE_DIRS) |