From ec3af259301e5f7a289ab5d444a2e8bc075b4aa5 Mon Sep 17 00:00:00 2001
From: Selim Mustafaev <selim@fastmail.fm>
Date: Sun, 21 Sep 2014 14:49:38 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC?=
 =?UTF-8?q?=D1=8B=20=D1=81=D0=BE=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B9=20boost=20=D0=B2=20linux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ustring.cpp     |  1 +
 src/utf.cpp         |  1 +
 test/CMakeLists.txt | 46 ++++++++++++++++++---------------------------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/src/ustring.cpp b/src/ustring.cpp
index 7ab7835..5007516 100755
--- a/src/ustring.cpp
+++ b/src/ustring.cpp
@@ -1,6 +1,7 @@
 #include "ustring.h"
 #include "ustring_asm.h"
 #include <fstream>
+#include <cstring>
 
 /**
  * Конструктор по умолчанию
diff --git a/src/utf.cpp b/src/utf.cpp
index ad6a34f..b442ec8 100755
--- a/src/utf.cpp
+++ b/src/utf.cpp
@@ -1,4 +1,5 @@
 #include "utf.h"
+#include <cstring>
 
 #if defined(__clang__)
 	#include <libkern/OSByteOrder.h>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 803f18a..2d26c85 100755
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,33 +9,23 @@ 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
-		TIMEOUT 100
-		CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CMAKE_SOURCE_DIR}/lib
-				   -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CMAKE_SOURCE_DIR}/lib
-				   -Dgtest_force_shared_crt=ON
-				   -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-				   -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-		INSTALL_COMMAND ""
-		LOG_DOWNLOAD ON
-		LOG_CONFIGURE ON
-		LOG_BUILD ON)
-		
-	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()
+ExternalProject_Add(
+    googletest
+    URL https://googletest.googlecode.com/files/gtest-1.7.0.zip
+    TIMEOUT 100
+    CMAKE_ARGS -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CMAKE_SOURCE_DIR}/lib
+               -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CMAKE_SOURCE_DIR}/lib
+               -Dgtest_force_shared_crt=ON
+               -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+               -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD ON
+    LOG_CONFIGURE ON
+    LOG_BUILD ON)
+
+ExternalProject_Get_Property(googletest source_dir)
+ExternalProject_Get_Property(googletest binary_dir)
+INCLUDE_DIRECTORIES(${source_dir}/include)
 
 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