anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +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

57
CMakeLists.txt
View File

@ -794,37 +794,36 @@ else()
add_subdirectory(3rdparty/zlib) add_subdirectory(3rdparty/zlib)
endif() endif()
if(LYX_EXTERNAL_BOOST) if(LYX_USE_STD_REGEX)
message(STATUS "Searching for boost") # Nothing to do
if(NOT LYX_USE_STD_REGEX)
find_package(Boost COMPONENTS regex)
endif()
if(Boost_FOUND)
message(STATUS "Boost found")
message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
if (LYX_STDLIB_DEBUG)
# Comment from Jean-Marc Lasgouttes:
# In general, system boost libraries are incompatible with
# the use of stdlib-debug in libstdc++. See ticket #9736 for
# details.
message(WARNING "Compiling LyX with stdlib-debug and system boost libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF' or using '-DLYX_EXTERNAL_BOOST=OFF'")
endif()
else()
message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
endif()
else() else()
if(NOT LYX_USE_STD_REGEX) # Using boost-regex
set(Lyx_Boost_Libraries boost_regex) if(LYX_EXTERNAL_BOOST)
endif() message(STATUS "Searching for external boost")
add_definitions(-DBOOST_USER_CONFIG=<config.h>) find_package(Boost COMPONENTS regex)
include_directories(${TOP_SRC_DIR}/3rdparty/boost) if(Boost_FOUND)
add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost") message(STATUS "Boost found")
message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
if (LYX_STDLIB_DEBUG)
# Comment from Jean-Marc Lasgouttes:
# In general, system boost libraries are incompatible with
# the use of stdlib-debug in libstdc++. See ticket #9736 for
# details.
message(WARNING "Compiling LyX with stdlib-debug and system boost libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF' or using '-DLYX_EXTERNAL_BOOST=OFF'")
endif()
else()
message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
endif()
else()
# Using included boost
set(Lyx_Boost_Libraries boost_regex)
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() endif()
if(WIN32) if(WIN32)
if(LYX_CONSOLE) if(LYX_CONSOLE)
set(LYX_QTMAIN_LIBRARY) set(LYX_QTMAIN_LIBRARY)
@ -839,7 +838,7 @@ if(WIN32)
else() else()
# -DPSAPI_VERSION=1 is not needed for mingw, since the mingw psapi.h # -DPSAPI_VERSION=1 is not needed for mingw, since the mingw psapi.h
# does not use it and always declares the vista compatible API. # does not use it and always declares the vista compatible API.
# If this ever changes then -DPSAPI_VERSION might be needed here as well. # If this ever changes then -DPSAPI_VERSION might be needed here as well.
add_definitions(-DWINVER=0x0500) add_definitions(-DWINVER=0x0500)
endif() endif()
endif() endif()