Skip to content
Snippets Groups Projects
Commit b087f736 authored by Alessandro D'Uffizi's avatar Alessandro D'Uffizi
Browse files

boost and jsoncpp correctly setted for compiling windows.Need to check correct linking

parent d2941fb7
No related branches found
No related tags found
No related merge requests found
cmake_minimum_required(VERSION 2.8)
MESSAGE("framework CMakeLists")
IF(WIN32)
include(config/CMakeChaosWin.txt)
#include(config/CMakeChaosWin.txt)
macro (MESG parm)
SET(WHERE ${CMAKE_CURRENT_LIST_DIR})
MESSAGE(STATUS "[${WHERE}] ${parm}")
endmacro()
ELSE(WIN32)
include(config/CMakeChaos.txt)
ENDIF(WIN32)
......
......@@ -51,14 +51,13 @@ MESG("Configure libBoost as CMake")
boost
GIT_REPOSITORY https://github.com/boostorg/boost.git
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 link=static install --prefix=${CMAKE_CURRENT_BINARY_DIR}/boostinstall
INSTALL_COMMAND b2 install --prefix=${CMAKE_CURRENT_BINARY_DIR}/boostinstall
BUILD_COMMAND b2 link=static install --prefix=${CMAKE_INSTALL_PREFIX}/boostinstall
INSTALL_COMMAND b2 install --prefix=${CMAKE_INSTALL_PREFIX}/boostinstall
LOG_DOWNLOAD 1
LOG_UPDATE 1
LOG_CONFIGURE 1
......@@ -75,9 +74,9 @@ ExternalProject_Add(
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}
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
LOG_DOWNLOAD 1
LOG_UPDATE 1
......@@ -413,7 +412,7 @@ SET(common_lib_src ${common_lib_src}
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)
INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/boostinstall/include/boost-1_70)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/boostinstall/lib)
else(WIN32)
INCLUDE_DIRECTORIES(script/lua/core ./chaos/common ./chaos/common/metadata_logging ../../)
......@@ -452,6 +451,7 @@ endif()
add_dependencies(${PROJECT_NAME} libzmq)
#ENDIF(NOT WIN32)
add_dependencies(${PROJECT_NAME} boost)
add_dependencies(${PROJECT_NAME} jsonCpp)
IF (CLING_VIRTUAL_MACHINE)
add_dependencies(${PROJECT_NAME} cling)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment