|
|
|
@ -48,7 +48,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
|
|
|
|
if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS})
|
|
|
|
|
message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env (not required)")
|
|
|
|
|
set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
|
|
|
|
|
elseif ("$ENV{DEVELOPER_LOCAL_TOOLS}" EQUAL 1)
|
|
|
|
|
elseif (ENV{DEVELOPER_LOCAL_TOOLS} EQUAL 1)
|
|
|
|
|
message(STATUS "Found: env DEVELOPER_LOCAL_TOOLS = 1")
|
|
|
|
|
set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT ON)
|
|
|
|
|
else()
|
|
|
|
@ -130,7 +130,7 @@ if(MSVC)
|
|
|
|
|
include_directories(SYSTEM src/platform/msc)
|
|
|
|
|
else()
|
|
|
|
|
set(ARCH native CACHE STRING "CPU to build for: -march value or default")
|
|
|
|
|
if("${ARCH}" STREQUAL "default")
|
|
|
|
|
if(ARCH STREQUAL "default")
|
|
|
|
|
set(ARCH_FLAG "")
|
|
|
|
|
else()
|
|
|
|
|
set(ARCH_FLAG "-march=${ARCH}")
|
|
|
|
@ -212,7 +212,7 @@ if(NOT Boost_FOUND)
|
|
|
|
|
die("Could not find Boost libraries, please make sure you have installed Boost or libboost-all-dev (1.53 or 1.55+) or the equivalent")
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
if((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 54))
|
|
|
|
|
if((Boost_MAJOR_VERSION EQUAL 1) AND (Boost_MINOR_VERSION EQUAL 54))
|
|
|
|
|
die("Boost version 1.54 is unsupported due to a bug (see: http://goo.gl/RrCFmA), please install Boost 1.53 or 1.55 and above")
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|