3rdparty/boost: build with cmake

diff --git a/3rdparty/boost/libs/regex/CMakeLists.txt b/3rdparty/boost/libs/regex/CMakeLists.txt
index 2d091381b4710b0df1e94c0791dcd5169c519f13..0b09b7792797b03f5885f5b321817d4ba8c3fa38 100644 (file)
--- 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 65a29f102f4732ebac38d664268e57388a14cf21..da0a8b01d4c1a832ea0b14629a578e06bc1d641b 100644 (file)
--- 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 c9a8027894b423054867b44835c7db6996b47f41..f657fd5cc350d1d2d4d9692e0347b2cb083b1710 100644 (file)
--- 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 fffcbf0c3cc6c041b6784c789f8042618fd3f9ed..39af9965cfab0ebf78e857c6df5ed089c2b3a2b8 100644 (file)
--- 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})