From 079190b415c4cf179a15bc349b63237b9a8cdabe Mon Sep 17 00:00:00 2001
From: aduffizi <alessandro.duffizi@lnf.infn.it>
Date: Fri, 29 Nov 2019 14:39:59 +0100
Subject: [PATCH] corrected cmakelist for all 4 projects on windows@
---
CMakeLists.txt | 1 +
chaos/cu_toolkit/CMakeLists.txt | 4 +++-
chaos_metadata_service_client/CMakeLists.txt | 2 +-
chaos_micro_unit_toolkit/CMakeLists.txt | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e007eee5..a01847241 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 2.8)
MESSAGE("framework CMakeLists")
IF(WIN32)
+add_definitions(-D_WIN32_WINNT=0x601)
#include(config/CMakeChaosWin.txt)
macro (MESG parm)
SET(WHERE ${CMAKE_CURRENT_LIST_DIR})
diff --git a/chaos/cu_toolkit/CMakeLists.txt b/chaos/cu_toolkit/CMakeLists.txt
index 827496dcf..c09092d63 100644
--- a/chaos/cu_toolkit/CMakeLists.txt
+++ b/chaos/cu_toolkit/CMakeLists.txt
@@ -1,8 +1,10 @@
project(chaos_cutoolkit)
if(WIN32)
+
set(CMAKE_SUPPRESS_REGENERATION true)
INCLUDE_DIRECTORIES( ../../ ${ALL_WINDOWS_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/boostinstall/include/boost-1_70)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/boostinstall/include/boost-1_70)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/boostinstall/lib)
ELSE()
INCLUDE_DIRECTORIES(chaos/cu ../../)
@@ -96,7 +98,7 @@ set (BOOST_LIBPATH ${CMAKE_INSTALL_PREFIX}/boostinstall/lib )
SET (ALL_WINDOWS_LIBS "DbgHelp.lib Netapi32.lib Iphlpapi.lib -LIBPATH:${BOOST_LIBPATH} chaos_common")
separate_arguments(chaos_cutoolkit_lib)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ALL_WINDOWS_LIBS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_common ${ALL_WINDOWS_LIBS})
FILE(GLOB files "*.h")
INSTALL(FILES ${files} DESTINATION include/chaos/cu_toolkit)
diff --git a/chaos_metadata_service_client/CMakeLists.txt b/chaos_metadata_service_client/CMakeLists.txt
index ce9d7611e..e7a5b34ec 100644
--- a/chaos_metadata_service_client/CMakeLists.txt
+++ b/chaos_metadata_service_client/CMakeLists.txt
@@ -146,7 +146,7 @@ ENDIF ()
IF (WIN32)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ALL_WINDOWS_LIBPATH} "-LIBPATH:C:/Users/aduffizi/source/repos/chaos_bundle/INSTALLPATH/lib/" chaos_common.lib )
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_common ${ALL_WINDOWS_LIBPATH} )
ELSE()
TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_common ${FrameworkLib})
ENDIF()
diff --git a/chaos_micro_unit_toolkit/CMakeLists.txt b/chaos_micro_unit_toolkit/CMakeLists.txt
index b9e6a22aa..89e6aaf3c 100644
--- a/chaos_micro_unit_toolkit/CMakeLists.txt
+++ b/chaos_micro_unit_toolkit/CMakeLists.txt
@@ -58,7 +58,7 @@ ENDIF ()
if(WIN32)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ALL_WINDOWS_LIBPATH} )
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_common ${ALL_WINDOWS_LIBPATH} )
else()
TARGET_LINK_LIBRARIES(${PROJECT_NAME} pthread)
endif()
--
GitLab