macro_bool_to_01(HAVE_UINTMAX_T HAVE_STDINT_H_WITH_UINTMAX)
check_type_size("long double" HAVE_LONG_DOUBLE)
-check_type_size("long long" HAVE_LONG_LONG)
+check_type_size("long long" HAVE_LONG_LONG_INT)
check_type_size(wchar_t HAVE_WCHAR_T)
check_type_size(wint_t HAVE_WINT_T)
set(HunspellTestFile "${CMAKE_BINARY_DIR}/hunspelltest.cpp")
file(WRITE "${HunspellTestFile}"
"
- #include <hunspell/hunspell.hxx>
+ #include <hunspell.hxx>
int main()
{
"${HunspellTestFile}"
CMAKE_FLAGS
"-DINCLUDE_DIRECTORIES:STRING=${HUNSPELL_INCLUDE_DIR}"
- "-DCMAKE_CXX_LINK_EXECUTABLE='${CMAKE_COMMAD} echo not linking now...'"
- OUTPUT_VARIABLE LOG2)
+ LINK_LIBRARIES ${HUNSPELL_LIBRARY}
+ OUTPUT_VARIABLE LOG2)
message(STATUS "HAVE_HUNSPELL_CXXABI = ${HAVE_HUNSPELL_CXXABI}")
#message(STATUS "LOG2 = ${LOG2}")
+ 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()
#check_cxx_source_compiles(
"
SIZEOF_LONG_LONG_GREATER_THAN_SIZEOF_LONG)
-check_cxx_source_compiles(
+if(LYX_DISABLE_CALLSTACK_PRINTING)
+ set(LYX_CALLSTACK_PRINTING OFF CACHE BOOL "Print callstack when crashing")
+else()
+ check_cxx_source_compiles(
"
#include <execinfo.h>
#include <cxxabi.h>
abi::__cxa_demangle(\"abcd\", 0, 0, &status);
}
"
-LYX_CALLSTACK_PRINTING)
+ LYX_CALLSTACK_PRINTING)
+endif()
# Check whether STL is libstdc++
check_cxx_source_compiles(
set(lyx_qt5_config "QtCore/qconfig.h")
endif()
if(WIN32)
- set(QT_USES_X11 CACHE "Win32 compiled without X11" 0)
+ set(QT_USES_X11 OFF CACHE BOOL "Win32 compiled without X11")
# The try_run for minngw would not work here anyway
else()
check_cxx_source_runs(