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

Cmake build: Ignore boost settings if we are using std-regex

Browse Source 
External/included boost is only used for the component regex
This commit is contained in:
Kornel Benko 2017-07-27 23:29:29 +02:00
parent 770ab9a824
commit 2fe59adbc8
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -794,11 +794,13 @@ else()
add_subdirectory(3rdparty/zlib)
endif()
if(LYX_USE_STD_REGEX)
# Nothing to do
else()
# Using boost-regex
if(LYX_EXTERNAL_BOOST)
message(STATUS "Searching for boost")
if(NOT LYX_USE_STD_REGEX)
message(STATUS "Searching for external boost")
find_package(Boost COMPONENTS regex)
endif()
if(Boost_FOUND)
message(STATUS "Boost found")
message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
@ -814,16 +816,13 @@ if(LYX_EXTERNAL_BOOST)
message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
endif()
else()
if(NOT LYX_USE_STD_REGEX)
# Using included boost
set(Lyx_Boost_Libraries boost_regex)
endif()
add_definitions(-DBOOST_USER_CONFIG=<config.h>)
include_directories(${TOP_SRC_DIR}/3rdparty/boost)
add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
endif()
endif()
if(WIN32)
if(LYX_CONSOLE)