selim/cpputil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлены проблемы со сборкой boost в linux

Browse Source
This commit is contained in:
Selim Mustafaev 2014-09-21 14:49:38 +04:00
parent b7af8aa6e4
commit ec3af25930
3 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ustring.cpp
View File

@ -1,6 +1,7 @@
#include "ustring.h" #include "ustring.h"
#include "ustring_asm.h" #include "ustring_asm.h"
#include <fstream> #include <fstream>
#include <cstring>
/** /**
* Конструктор по умолчанию * Конструктор по умолчанию

1
src/utf.cpp
View File

@ -1,4 +1,5 @@
#include "utf.h" #include "utf.h"
#include <cstring>
#if defined(__clang__) #if defined(__clang__)
#include <libkern/OSByteOrder.h> #include <libkern/OSByteOrder.h>

46
test/CMakeLists.txt
View File

@ -9,33 +9,23 @@ set(boost_version_underscored 1_56_0)
INCLUDE(ExternalProject) INCLUDE(ExternalProject)
SET_DIRECTORY_PROPERTIES(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/ThirdParty) SET_DIRECTORY_PROPERTIES(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/ThirdParty)
if(APPLE) ExternalProject_Add(
ExternalProject_Add( googletest
googletest URL https://googletest.googlecode.com/files/gtest-1.7.0.zip
URL https://googletest.googlecode.com/files/gtest-1.7.0.zip TIMEOUT 100
TIMEOUT 100 CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CMAKE_SOURCE_DIR}/lib
CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CMAKE_SOURCE_DIR}/lib -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CMAKE_SOURCE_DIR}/lib
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CMAKE_SOURCE_DIR}/lib -Dgtest_force_shared_crt=ON
-Dgtest_force_shared_crt=ON -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} INSTALL_COMMAND ""
INSTALL_COMMAND "" LOG_DOWNLOAD ON
LOG_DOWNLOAD ON LOG_CONFIGURE ON
LOG_CONFIGURE ON LOG_BUILD ON)
LOG_BUILD ON)
ExternalProject_Get_Property(googletest source_dir)
ExternalProject_Get_Property(googletest source_dir) ExternalProject_Get_Property(googletest binary_dir)
ExternalProject_Get_Property(googletest binary_dir) INCLUDE_DIRECTORIES(${source_dir}/include)
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) if(CMAKE_BUILD_TYPE MATCHES RELEASE)
set(boost_build_type "release") set(boost_build_type "release")
@ -47,7 +37,7 @@ ExternalProject_Add(
boost boost
URL http://switch.dl.sourceforge.net/project/boost/boost/${boost_version}/boost_${boost_version_underscored}.zip URL http://switch.dl.sourceforge.net/project/boost/boost/${boost_version}/boost_${boost_version_underscored}.zip
CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=coroutine 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 BUILD_IN_SOURCE 1
INSTALL_COMMAND "" INSTALL_COMMAND ""
LOG_DOWNLOAD ON LOG_DOWNLOAD ON