anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

3rdparty/boost: build with cmake

Browse Source
This commit is contained in:
Peter Kümmel 2015-12-20 13:40:37 +01:00
parent 5287f1c8b6
commit 3c3141dc23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdparty/boost/libs/regex/CMakeLists.txt vendored
View File

@ -18,8 +18,9 @@ set(boost_regex_sources
static_mutex.cpp static_mutex.cpp
w32_regex_traits.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}) add_library(boost_regex STATIC ${boost_regex_sources})
set_target_properties(boost_regex PROPERTIES FOLDER "3rd_party") set_target_properties(boost_regex PROPERTIES FOLDER "3rd_party")

2
3rdparty/boost/libs/signals/CMakeLists.txt vendored
View File

@ -14,7 +14,7 @@ set(boost_signals_sources
trackable.cpp 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) if(NOT LYX_MERGE_FILES)
add_library(boost_signals STATIC ${boost_signals_sources}) add_library(boost_signals STATIC ${boost_signals_sources})

4
CMakeLists.txt
View File

@ -713,8 +713,8 @@ else()
endif() endif()
add_definitions(-DBOOST_USER_CONFIG="<config.h>") add_definitions(-DBOOST_USER_CONFIG="<config.h>")
add_definitions(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1) add_definitions(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1)
include_directories(${TOP_SRC_DIR}/boost) include_directories(${TOP_SRC_DIR}/3rdparty/boost)
add_subdirectory(boost "${TOP_BINARY_DIR}/boost") add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
endif() endif()

2
src/client/CMakeLists.txt
View File

@ -16,7 +16,7 @@ list(REMOVE_ITEM _lyxclient_sources "${TOP_SRC_DIR}/src/client/lyxclient.cpp")
include_directories(BEFORE include_directories(BEFORE
"${TOP_SRC_DIR}/src/client" "${TOP_SRC_DIR}/src/client"
"${TOP_SRC_DIR}/boost" "${TOP_SRC_DIR}/3rdparty/boost"
${ZLIB_INCLUDE_DIR}) ${ZLIB_INCLUDE_DIR})
add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers}) add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers})