From 8fe96558dfb3bab715e4d81221f9a0c6f6de572b Mon Sep 17 00:00:00 2001 From: clemahieu Date: Tue, 19 Apr 2016 23:37:01 -0500 Subject: [PATCH] Using threadsafe spirit and lowering boost version requirement. --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2473c35..527a46ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required (VERSION 2.8.11) project (rai) if (WIN32) - set (PLATFORM_COMPILE_FLAGS "-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN") + set (PLATFORM_COMPILE_FLAGS "-DBOOST_SPIRIT_THREADSAFE -D_WIN32_WINNT=0x0501 -DWINVER=0x0501 -DWIN32_LEAN_AND_MEAN") else (WIN32) - set (PLATFORM_COMPILE_FLAGS "-Werror=switch -msse4 -fPIC") + set (PLATFORM_COMPILE_FLAGS "-DBOOST_SPIRIT_THREADSAFE -Werror=switch -msse4 -fPIC") endif (WIN32) if (WIN32) @@ -39,8 +39,7 @@ endif (WIN32) include_directories (${CMAKE_SOURCE_DIR}) -# Boost 1.59.0 has the json parser written with spirit2 which fixes thread safety issues -find_package (Boost 1.59.0 REQUIRED COMPONENTS filesystem system log log_setup thread program_options) +find_package (Boost 1.57.0 REQUIRED COMPONENTS filesystem system log log_setup thread program_options) include_directories (${Boost_INCLUDE_DIR}) find_package (Qt5 REQUIRED COMPONENTS Core Gui Widgets Test ${PLATFORM_QT_PACKAGES})