From 3c3141dc233007e692e0170c03ac8aedac2d589d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <kuemmel@lyx.org>
Date: Sun, 20 Dec 2015 13:40:37 +0100
Subject: [PATCH] 3rdparty/boost: build with cmake

---
 3rdparty/boost/libs/regex/CMakeLists.txt   | 3 ++-
 3rdparty/boost/libs/signals/CMakeLists.txt | 2 +-
 CMakeLists.txt                             | 4 ++--
 src/client/CMakeLists.txt                  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/3rdparty/boost/libs/regex/CMakeLists.txt b/3rdparty/boost/libs/regex/CMakeLists.txt
index 2d091381b4..0b09b77927 100644
--- a/3rdparty/boost/libs/regex/CMakeLists.txt
+++ b/3rdparty/boost/libs/regex/CMakeLists.txt
@@ -18,8 +18,9 @@ set(boost_regex_sources
 	static_mutex.cpp
 	w32_regex_traits.cpp)
 
-lyx_add_path(boost_regex_sources ${TOP_SRC_DIR}/boost/libs/regex/src)
+lyx_add_path(boost_regex_sources ${TOP_SRC_DIR}/3rdparty/boost/libs/regex/src)
 
 add_library(boost_regex STATIC ${boost_regex_sources})
+
 set_target_properties(boost_regex PROPERTIES FOLDER "3rd_party")
 
diff --git a/3rdparty/boost/libs/signals/CMakeLists.txt b/3rdparty/boost/libs/signals/CMakeLists.txt
index 65a29f102f..da0a8b01d4 100644
--- a/3rdparty/boost/libs/signals/CMakeLists.txt
+++ b/3rdparty/boost/libs/signals/CMakeLists.txt
@@ -14,7 +14,7 @@ set(boost_signals_sources
 	trackable.cpp
 )
 
-lyx_add_path(boost_signals_sources ${TOP_SRC_DIR}/boost/libs/signals/src)
+lyx_add_path(boost_signals_sources ${TOP_SRC_DIR}/3rdparty/boost/libs/signals/src)
 
 if(NOT LYX_MERGE_FILES)
 	add_library(boost_signals STATIC ${boost_signals_sources})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9a8027894..f657fd5cc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -713,8 +713,8 @@ else()
 	endif()
 	add_definitions(-DBOOST_USER_CONFIG="<config.h>")
 	add_definitions(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1)
-	include_directories(${TOP_SRC_DIR}/boost)
-	add_subdirectory(boost "${TOP_BINARY_DIR}/boost")
+	include_directories(${TOP_SRC_DIR}/3rdparty/boost)
+	add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
 endif()
 
 
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index fffcbf0c3c..39af9965cf 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -16,7 +16,7 @@ list(REMOVE_ITEM _lyxclient_sources "${TOP_SRC_DIR}/src/client/lyxclient.cpp")
 
 include_directories(BEFORE 
 	"${TOP_SRC_DIR}/src/client" 
-	"${TOP_SRC_DIR}/boost" 
+	"${TOP_SRC_DIR}/3rdparty/boost" 
 	${ZLIB_INCLUDE_DIR})
 
 add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers})