[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-cvs
Subject:    [LyX/master] Cmake build: Amend 2fe59ad, Ignore boost settings if we are using std-regex
From:       Kornel Benko <kornel () lyx ! org>
Date:       2017-07-28 9:41:15
Message-ID: 20170728094115.61FDD2807A4 () lyx ! lyx ! org
[Download RAW message or body]

commit b5c2e02ebd66b6407da1fa50865a56a495544061
Author: Kornel Benko <kornel@lyx.org>
Date:   Fri Jul 28 11:35:50 2017 +0200

    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 files changed, 6 insertions(+), 1 deletions(-)

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

[prev in list] [next in list] [prev in thread] [next in thread]