From 4ea545ceaa077a426d5eb413c6e7f3b5bb5d54c7 Mon Sep 17 00:00:00 2001
From: aduffizi <alessandro.duffizi@lnf.infn.it>
Date: Tue, 26 Nov 2019 11:02:47 +0100
Subject: [PATCH] minor windows
---
CMakeLists.txt | 6 ++++++
chaos/common/CMakeLists.txt | 34 +++++++++++++++++++++++++++++++---
2 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6297f995c..41df948e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,12 @@ option(CHAOS_DATA_EXPORT "Chaos Data Export" OFF)
option(CHAOS_EXAMPLES "Chaos Examples" OFF)
#warning possibile perdita di dati spento.
add_definitions(-wd"4267")
+
+
+SET (ALL_WINDOWS_LIBPATH "DbgHelp.lib Netapi32.lib Iphlpapi.lib")
+
+
+
else (WIN32)
option(CHAOS_MDS "Chaos Data Service" ON)
option(CHAOS_AGENT "Chaos Agent Service" ON)
diff --git a/chaos/common/CMakeLists.txt b/chaos/common/CMakeLists.txt
index 7242cf101..a396e62fa 100644
--- a/chaos/common/CMakeLists.txt
+++ b/chaos/common/CMakeLists.txt
@@ -50,23 +50,47 @@ MESG("Configure libBoost as CMake")
ExternalProject_Add(
boost
GIT_REPOSITORY https://github.com/boostorg/boost.git
- PREFIX "c:/local/boost"
+ PREFIX ${CMAKE_CURRENT_BINARY_DIR}/boost
GIT_TAG boost-1.70.0
GIT_PROGRESS 1
BUILD_IN_SOURCE 1
UPDATE_COMMAND ""
CONFIGURE_COMMAND bootstrap.bat
- BUILD_COMMAND b2
- INSTALL_COMMAND ""
+ BUILD_COMMAND b2 link=static install --prefix=${CMAKE_CURRENT_BINARY_DIR}/boostinstall
+ INSTALL_COMMAND b2 install --prefix=${CMAKE_CURRENT_BINARY_DIR}/boostinstall
LOG_DOWNLOAD 1
LOG_UPDATE 1
LOG_CONFIGURE 1
LOG_BUILD 1
LOG_INSTALL 1
)
+MESSAGE("Configure JsonCpp as CMake External Project")
+ExternalProject_Add(
+ jsonCpp
+ GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp
+
+ GIT_TAG 1.9.2
+ GIT_PROGRESS 1
+ PREFIX "${CMAKE_BINARY_DIR}/ext_dep/libjsoncpp-prefix"
+ SOURCE_DIR "${CMAKE_BINARY_DIR}/ext_dep/libjsoncpp-src"
+ BINARY_DIR "${CMAKE_BINARY_DIR}/ext_dep/libjsoncpp-build"
+
+ CMAKE_ARGS
+ -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+
+ LOG_DOWNLOAD 1
+ LOG_UPDATE 1
+ LOG_CONFIGURE 1
+ LOG_BUILD 1
+ LOG_INSTALL 1
+ )
+
+
+
ENDIF(WIN32)
+
IF (CLING_VIRTUAL_MACHINE_ENABLE)
MESG("Using ${CMAKE_BINARY_DIR}/ext_dep/cling-src for download cling")
IF(NOT EXISTS ${CMAKE_BINARY_DIR}/ext_dep/cling-src)
@@ -388,6 +412,9 @@ SET(common_lib_src ${common_lib_src}
#compile lua chaos vm and core files
if (WIN32)
INCLUDE_DIRECTORIES( ../../ script/lua/core ${ALL_WINDOWS_INCLUDE_DIR})
+MESSAGE("ALEDEBUG CMAKE CURRENT BINARY DIR" ${CMAKE_CURRENT_BINARY_DIR} )
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/boost/src/boost)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/boostinstall/lib)
else(WIN32)
INCLUDE_DIRECTORIES(script/lua/core ./chaos/common ./chaos/common/metadata_logging ../../)
endif(WIN32)
@@ -424,6 +451,7 @@ endif()
add_dependencies(${PROJECT_NAME} libzmq)
#ENDIF(NOT WIN32)
+add_dependencies(${PROJECT_NAME} boost)
IF (CLING_VIRTUAL_MACHINE)
add_dependencies(${PROJECT_NAME} cling)
--
GitLab