anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 10:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend 09684899d6 for cmake build:

Browse Source
This commit is contained in:
Kornel Benko 2024-10-24 14:36:40 +02:00
parent 6c46cc66c9
commit cd3d3957c5
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
development/cmake/ConfigureChecks.cmake
View File

@ -185,19 +185,6 @@ else()
LYX_CALLSTACK_PRINTING) LYX_CALLSTACK_PRINTING)
endif() endif()
# Check whether STL is libstdc++
check_cxx_source_compiles(
"
#include <vector>
int main() {
#if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__)
this is not libstdc++
#endif
return(0);
}
"
lyx_cv_lib_stdcxx)
# Check whether STL is libstdc++ with C++11 ABI # Check whether STL is libstdc++ with C++11 ABI
check_cxx_source_compiles( check_cxx_source_compiles(
" "
@ -232,8 +219,6 @@ check_cxx_source_compiles(
" "
HAVE_DEF_MAKE_UNIQUE) HAVE_DEF_MAKE_UNIQUE)
LYX_USE_STD_CALL_ONCE)
if (ENCHANT_FOUND) if (ENCHANT_FOUND)
set(CMAKE_REQUIRED_INCLUDES ${ENCHANT_INCLUDE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${ENCHANT_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${ENCHANT_LIBRARY}) set(CMAKE_REQUIRED_LIBRARIES ${ENCHANT_LIBRARY})
@ -252,19 +237,7 @@ if (ENCHANT_FOUND)
endif() endif()
endif() endif()
set(USE_LLVM_LIBCPP)
set(STD_STRING_USES_COW)
set(USE_GLIBCXX_CXX11_ABI) set(USE_GLIBCXX_CXX11_ABI)
if(lyx_cv_lib_stdcxx)
if(NOT USE_GLIBCXX_CXX11_ABI)
set(STD_STRING_USES_COW 1)
endif()
else()
if(lyx_cv_prog_clang)
# use libc++ provided by llvm instead of GNU libstdc++
set(USE_LLVM_LIBCPP 1)
endif()
endif()
set(HAVE_QT5_X11_EXTRAS) set(HAVE_QT5_X11_EXTRAS)
set(HAVE_QT6_X11_EXTRAS) set(HAVE_QT6_X11_EXTRAS)

6
development/cmake/config.h.cmake
View File

@ -53,12 +53,6 @@
// Define if callstack can be printed // Define if callstack can be printed
#cmakedefine LYX_CALLSTACK_PRINTING 1 #cmakedefine LYX_CALLSTACK_PRINTING 1
// Define if std::string uses copy-on-write
#cmakedefine STD_STRING_USES_COW 1
// use libc++ provided by llvm instead of GNU libstdc++
#cmakedefine USE_LLVM_LIBCPP 1
// use GNU libstdc++ with C++11 ABI // use GNU libstdc++ with C++11 ABI
#cmakedefine USE_GLIBCXX_CXX11_ABI 1 #cmakedefine USE_GLIBCXX_CXX11_ABI 1