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

Cmake build: Amend 2fe59ad, Ignore boost settings if we are using std-regex

Browse Source 
Even in std-regex case we still need some includes from boost.
Therefore we also need an appropriate include path set.
This commit is contained in:
Kornel Benko 2017-07-28 11:35:50 +02:00
parent 57d3247d51
commit b5c2e02ebd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -795,7 +795,12 @@ else()
endif() endif()
if(LYX_USE_STD_REGEX) if(LYX_USE_STD_REGEX)
# Nothing to do # Set only include path.
# Use internal boost, which is known to exist
# we don't need any libraries
set(Lyx_Boost_Libraries)
add_definitions(-DBOOST_USER_CONFIG=<config.h>)
include_directories(${TOP_SRC_DIR}/3rdparty/boost)
else() else()
# Using boost-regex # Using boost-regex
if(LYX_EXTERNAL_BOOST) if(LYX_EXTERNAL_BOOST)