Исправлены проблемы со сборкой boost в linux
This commit is contained in:
parent
b7af8aa6e4
commit
ec3af25930
@ -1,6 +1,7 @@
|
||||
#include "ustring.h"
|
||||
#include "ustring_asm.h"
|
||||
#include <fstream>
|
||||
#include <cstring>
|
||||
|
||||
/**
|
||||
* Конструктор по умолчанию
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#include "utf.h"
|
||||
#include <cstring>
|
||||
|
||||
#if defined(__clang__)
|
||||
#include <libkern/OSByteOrder.h>
|
||||
|
||||
@ -9,7 +9,6 @@ set(boost_version_underscored 1_56_0)
|
||||
INCLUDE(ExternalProject)
|
||||
SET_DIRECTORY_PROPERTIES(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/ThirdParty)
|
||||
|
||||
if(APPLE)
|
||||
ExternalProject_Add(
|
||||
googletest
|
||||
URL https://googletest.googlecode.com/files/gtest-1.7.0.zip
|
||||
@ -27,15 +26,6 @@ if(APPLE)
|
||||
ExternalProject_Get_Property(googletest source_dir)
|
||||
ExternalProject_Get_Property(googletest binary_dir)
|
||||
INCLUDE_DIRECTORIES(${source_dir}/include)
|
||||
else()
|
||||
FIND_PACKAGE(GTest REQUIRED)
|
||||
if(NOT GTEST_FOUND)
|
||||
message(SEND_ERROR "Failed to find Google Test Framework")
|
||||
return()
|
||||
else()
|
||||
include_directories(${GTEST_INCLUDE_DIRS})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(CMAKE_BUILD_TYPE MATCHES RELEASE)
|
||||
set(boost_build_type "release")
|
||||
@ -47,7 +37,7 @@ ExternalProject_Add(
|
||||
boost
|
||||
URL http://switch.dl.sourceforge.net/project/boost/boost/${boost_version}/boost_${boost_version_underscored}.zip
|
||||
CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=coroutine
|
||||
BUILD_COMMAND ./b2 --stagedir=${CMAKE_SOURCE_DIR} link=static threading=multi cxxflags=-std=c++11 ${boost_build_type}
|
||||
BUILD_COMMAND ./b2 --ignore-site-config --stagedir=${CMAKE_SOURCE_DIR} link=static threading=multi cxxflags=-std=c++11 ${boost_build_type}
|
||||
BUILD_IN_SOURCE 1
|
||||
INSTALL_COMMAND ""
|
||||
LOG_DOWNLOAD ON
|
||||
|
||||
Loading…
Reference in New Issue
Block a user