anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not check for Standard C++ features anymore.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19762 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-08-23 21:18:53 +00:00
parent ebab4e7033
commit 214f1de1b8
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
development/cmake/ConfigureChecks.cmake
View File

@ -16,11 +16,11 @@ include(CheckCXXSourceCompiles)
check_include_file_cxx(aspell.h HAVE_ASPELL_H) check_include_file_cxx(aspell.h HAVE_ASPELL_H)
check_include_file_cxx(aspell/aspell.h HAVE_ASPELL_ASPELL_H) check_include_file_cxx(aspell/aspell.h HAVE_ASPELL_ASPELL_H)
check_include_file_cxx(istream HAVE_ISTREAM) #check_include_file_cxx(istream HAVE_ISTREAM)
check_include_file_cxx(ostream HAVE_OSTREAM) #check_include_file_cxx(ostream HAVE_OSTREAM)
check_include_file_cxx(ios HAVE_IOS) #check_include_file_cxx(ios HAVE_IOS)
check_include_file_cxx(sstream HAVE_SSTREAM) #check_include_file_cxx(sstream HAVE_SSTREAM)
check_include_file_cxx(locale HAVE_LOCALE) #check_include_file_cxx(locale HAVE_LOCALE)
check_include_files(io.h HAVE_IO_H) check_include_files(io.h HAVE_IO_H)
check_include_files(limits.h HAVE_LIMITS_H) check_include_files(limits.h HAVE_LIMITS_H)
@ -93,34 +93,34 @@ check_type_size(wchar_t HAVE_WCHAR_T)
check_type_size(wint_t HAVE_WINT_T) check_type_size(wint_t HAVE_WINT_T)
check_cxx_source_compiles( #check_cxx_source_compiles(
" # "
#include <algorithm> # #include <algorithm>
using std::count; # using std::count;
int countChar(char * b, char * e, char const c) # int countChar(char * b, char * e, char const c)
{ # {
return count(b, e, c); # return count(b, e, c);
} # }
int main(){return 0;} # int main(){return 0;}
" # "
HAVE_STD_COUNT) #HAVE_STD_COUNT)
check_cxx_source_compiles( #check_cxx_source_compiles(
" # "
#include <streambuf> # #include <streambuf>
#include <istream> # #include <istream>
typedef std::istreambuf_iterator<char> type; # typedef std::istreambuf_iterator<char> type;
int main(){return 0;} # int main(){return 0;}
" # "
HAVE_DECL_ISTREAMBUF_ITERATOR) #HAVE_DECL_ISTREAMBUF_ITERATOR)
check_cxx_source_compiles( #check_cxx_source_compiles(
" # "
#include <cctype> # #include <cctype>
using std::tolower; # using std::tolower;
int main(){return 0;} # int main(){return 0;}
" # "
CXX_GLOBAL_CSTD) #CXX_GLOBAL_CSTD)
check_cxx_source_compiles( check_cxx_source_compiles(
" "

4
development/cmake/src/support/CMakeLists.txt
View File

@ -21,7 +21,9 @@ list(REMOVE_ITEM support_sources
${TOP_SRC_DIR}/src/support/os_cygwin.cpp ${TOP_SRC_DIR}/src/support/os_cygwin.cpp
${TOP_SRC_DIR}/src/support/os_os2.C ${TOP_SRC_DIR}/src/support/os_os2.C
${TOP_SRC_DIR}/src/support/atexit.c ${TOP_SRC_DIR}/src/support/atexit.c
${TOP_SRC_DIR}/src/support/strerror.c) ${TOP_SRC_DIR}/src/support/strerror.c
${TOP_SRC_DIR}/src/support/minizip/iowin32.h
${TOP_SRC_DIR}/src/support/minizip/iowin32.c)
set(support_sources ${support_sources} ${CMAKE_CURRENT_BINARY_DIR}/package.C) set(support_sources ${support_sources} ${CMAKE_CURRENT_BINARY_DIR}/package.C)