commit 40e071c7cb6206ab98328eb4e685e698a1e05af1
Author: Kornel Benko <[email protected]>
Date: Sat Jul 11 12:43:17 2020 +0200
Cmake build: Improve checks for stdlib-debug
---
CMakeLists.txt | 4 ++--
development/cmake/ConfigureChecks.cmake | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fbdcc4..e208feb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -926,12 +926,12 @@ else()
message(STATUS "Boost found")
message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
- if (LYX_STDLIB_DEBUG)
+ if (LYX_STDLIB_DEBUG OR LYX_DEBUG_GLIBC OR LYX_DEBUG_GLIBC_PEDANTIC)
# 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'")
+ message(FATAL_ERROR "Compiling LyX with stdlib-debug and system boost
libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF
-DLYX_DEBUG_GLIBC=OFF -DLYX_DEBUG_GLIBC_PEDANTIC=OFF' or using
'-DLYX_EXTERNAL_BOOST=OFF'")
endif()
else()
message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
diff --git a/development/cmake/ConfigureChecks.cmake
b/development/cmake/ConfigureChecks.cmake
index ea74b1e..06c9a44 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -98,8 +98,8 @@ if(HUNSPELL_FOUND)
message(STATUS "HAVE_HUNSPELL_CXXABI = ${HAVE_HUNSPELL_CXXABI}")
#message(STATUS "LOG2 = ${LOG2}")
- if(LYX_EXTERNAL_HUNSPELL AND LYX_STDLIB_DEBUG AND HAVE_HUNSPELL_CXXABI)
- message(WARNING "Compiling LyX with stdlib-debug and system hunspell
libraries may lead to crashes. Consider using -DLYX_STDLIB_DEBUG=OFF or
-DLYX_EXTERNAL_HUNSPELL=OFF.")
+ if(LYX_EXTERNAL_HUNSPELL AND (LYX_STDLIB_DEBUG OR LYX_DEBUG_GLIBC OR
LYX_DEBUG_GLIBC_PEDANTIC) AND HAVE_HUNSPELL_CXXABI)
+ message(FATAL_ERROR "Compiling LyX with stdlib-debug and system hunspell
libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF
-DLYX_DEBUG_GLIBC=OFF -DLYX_DEBUG_GLIBC_PEDANTIC=OFF' or
-DLYX_EXTERNAL_HUNSPELL=OFF.")
endif()
endif()
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
