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

[features.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48cc85a13c87b0a3e19e69f38ff59e1014155cdd..369728b6fd60e87ae8e0b79f64ceb19ffbb458cd 100644 (file)
--- 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=<config.h>)
+  include_directories(${TOP_SRC_DIR}/3rdparty/boost)
 else()
   # Using boost-regex
   if(LYX_EXTERNAL_BOOST)