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: Check for make_unique and PATH_MAX symbols added.

Browse Source
This commit is contained in:
Kornel Benko 2016-06-12 19:56:31 +02:00
parent a80e0cacb9
commit 2da1c956e4
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
development/cmake/ConfigureChecks.cmake
View File

@ -61,6 +61,7 @@ check_symbol_exists(pid_t "sys/types.h" HAVE_PID_T)
check_symbol_exists(intmax_t "inttypes.h" HAVE_INTTYPES_H_WITH_UINTMAX) check_symbol_exists(intmax_t "inttypes.h" HAVE_INTTYPES_H_WITH_UINTMAX)
check_symbol_exists(uintmax_t "stdint.h" HAVE_STDINT_H_WITH_UINTMAX) check_symbol_exists(uintmax_t "stdint.h" HAVE_STDINT_H_WITH_UINTMAX)
check_symbol_exists(LC_MESSAGES "locale.h" HAVE_LC_MESSAGES) check_symbol_exists(LC_MESSAGES "locale.h" HAVE_LC_MESSAGES)
check_symbol_exists(PATH_MAX "limits.h" HAVE_DEF_PATH_MAX)
check_type_size(intmax_t HAVE_INTMAX_T) check_type_size(intmax_t HAVE_INTMAX_T)
macro_bool_to_01(HAVE_UINTMAX_T HAVE_STDINT_H_WITH_UINTMAX) macro_bool_to_01(HAVE_UINTMAX_T HAVE_STDINT_H_WITH_UINTMAX)
@ -172,6 +173,16 @@ check_cxx_source_compiles(
" "
lyx_cv_prog_clang) lyx_cv_prog_clang)
check_cxx_source_compiles(
"
#include <memory>
using std::make_unique;
int main() {
return(0);
}
"
HAVE_DEF_MAKE_UNIQUE)
set(USE_LLVM_LIBCPP) set(USE_LLVM_LIBCPP)
set(STD_STRING_USES_COW) set(STD_STRING_USES_COW)
set(USE_GLIBCXX_CXX11_ABI) set(USE_GLIBCXX_CXX11_ABI)
@ -230,4 +241,3 @@ elseif(LYX_USE_QT MATCHES "QT4")
else() else()
message(FATAL_ERROR "Check for QT_USES_X11: Not handled LYX_USE_QT (= ${LYX_USE_QT})") message(FATAL_ERROR "Check for QT_USES_X11: Not handled LYX_USE_QT (= ${LYX_USE_QT})")
endif() endif()

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

@ -48,7 +48,7 @@
#cmakedefine USE_POSIX_PACKAGING 1 #cmakedefine USE_POSIX_PACKAGING 1
#cmakedefine USE_WINDOWS_PACKAGING 1 #cmakedefine USE_WINDOWS_PACKAGING 1
#cmakedefine USE_MACOSX_PACKAGING 1 #cmakedefine USE_MACOSX_PACKAGING 1
#cmakedefine PATH_MAX ${PATH_MAX} #cmakedefine HAVE_DEF_PATH_MAX 1
#cmakedefine WORDS_BIGENDIAN 1 #cmakedefine WORDS_BIGENDIAN 1
@ -86,6 +86,7 @@ ${Include_used_spellchecker}
#define ENABLE_NLS 1 #define ENABLE_NLS 1
#endif #endif
#cmakedefine HAVE_DEF_MAKE_UNIQUE 1
#endif // config.h guard #endif // config.h guard

1
development/cmake/modules/FindCXX11Compiler.cmake
View File

@ -41,6 +41,7 @@ else()
set(CXX11_FLAG_CANDIDATES "--std=gnu++11") set(CXX11_FLAG_CANDIDATES "--std=gnu++11")
else() else()
set(CXX11_FLAG_CANDIDATES set(CXX11_FLAG_CANDIDATES
"--std=c++14"
"--std=c++11" "--std=c++11"
"--std=gnu++11" "--std=gnu++11"
"--std=gnu++0x" "--std=gnu++0x"