From 214f1de1b887b6cee86c3714fde796e56f211375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Thu, 23 Aug 2007 21:18:53 +0000 Subject: [PATCH] do not check for Standard C++ features anymore. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19762 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/ConfigureChecks.cmake | 62 ++++++++++---------- development/cmake/src/support/CMakeLists.txt | 4 +- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake index ec37b59ac6..d87fd3cab9 100644 --- a/development/cmake/ConfigureChecks.cmake +++ b/development/cmake/ConfigureChecks.cmake @@ -16,11 +16,11 @@ include(CheckCXXSourceCompiles) check_include_file_cxx(aspell.h HAVE_ASPELL_H) check_include_file_cxx(aspell/aspell.h HAVE_ASPELL_ASPELL_H) -check_include_file_cxx(istream HAVE_ISTREAM) -check_include_file_cxx(ostream HAVE_OSTREAM) -check_include_file_cxx(ios HAVE_IOS) -check_include_file_cxx(sstream HAVE_SSTREAM) -check_include_file_cxx(locale HAVE_LOCALE) +#check_include_file_cxx(istream HAVE_ISTREAM) +#check_include_file_cxx(ostream HAVE_OSTREAM) +#check_include_file_cxx(ios HAVE_IOS) +#check_include_file_cxx(sstream HAVE_SSTREAM) +#check_include_file_cxx(locale HAVE_LOCALE) check_include_files(io.h HAVE_IO_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_cxx_source_compiles( - " - #include - using std::count; - int countChar(char * b, char * e, char const c) - { - return count(b, e, c); - } - int main(){return 0;} - " -HAVE_STD_COUNT) +#check_cxx_source_compiles( +# " +# #include +# using std::count; +# int countChar(char * b, char * e, char const c) +# { +# return count(b, e, c); +# } +# int main(){return 0;} +# " +#HAVE_STD_COUNT) -check_cxx_source_compiles( - " - #include - #include - typedef std::istreambuf_iterator type; - int main(){return 0;} - " -HAVE_DECL_ISTREAMBUF_ITERATOR) +#check_cxx_source_compiles( +# " +# #include +# #include +# typedef std::istreambuf_iterator type; +# int main(){return 0;} +# " +#HAVE_DECL_ISTREAMBUF_ITERATOR) -check_cxx_source_compiles( - " - #include - using std::tolower; - int main(){return 0;} - " -CXX_GLOBAL_CSTD) +#check_cxx_source_compiles( +# " +# #include +# using std::tolower; +# int main(){return 0;} +# " +#CXX_GLOBAL_CSTD) check_cxx_source_compiles( " diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt index 65ccbbc8a4..0221d64d67 100644 --- a/development/cmake/src/support/CMakeLists.txt +++ b/development/cmake/src/support/CMakeLists.txt @@ -21,7 +21,9 @@ list(REMOVE_ITEM support_sources ${TOP_SRC_DIR}/src/support/os_cygwin.cpp ${TOP_SRC_DIR}/src/support/os_os2.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)