From b5c2e02ebd66b6407da1fa50865a56a495544061 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Fri, 28 Jul 2017 11:35:50 +0200 Subject: [PATCH] Cmake build: Amend 2fe59ad, Ignore boost settings if we are using std-regex Even in std-regex case we still need some includes from boost. Therefore we also need an appropriate include path set. --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48cc85a13c..369728b6fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -795,7 +795,12 @@ else() endif() 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=) + include_directories(${TOP_SRC_DIR}/3rdparty/boost) else() # Using boost-regex if(LYX_EXTERNAL_BOOST) -- 2.39.5