From 8e02385cea9d9cad00419ecc28190a0ed93acfcf Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Fri, 16 Oct 2009 10:51:58 +0000 Subject: [PATCH] Applied revision 31646 to cmake-build too Do not check for headers strings.h, io.h, process.h Do not check for functions mkstemp, mktemp Do not check for declarations of istreambug_iterator, iterator, mktemp git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31647 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 3 ++- development/cmake/ConfigureChecks.cmake | 14 -------------- development/cmake/configCompiler.h.cmake | 6 ------ 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 50f38244d4..2cad68eb3b 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -197,7 +197,8 @@ endif() if(WIN32) find_library(HUNSPELL_LIBRARY "libhunspell") else() - find_library(HUNSPELL_LIBRARY "hunspell") + #find_library(HUNSPELL_LIBRARY NAME "hunspell" PATH "/usr/local/lib" "/usr/lib" NO_DEFAULT_PATH) + find_library(HUNSPELL_LIBRARY "hunspell" "/usr/local/lib" "/usr/lib") endif() if (HUNSPELL_LIBRARY) find_file(HUNSPELL_FOUND "hunspell/hunspell.hxx") diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake index 4bafbe1c8d..e666a7f461 100644 --- a/development/cmake/ConfigureChecks.cmake +++ b/development/cmake/ConfigureChecks.cmake @@ -25,10 +25,8 @@ check_include_file_cxx(aspell/aspell.h HAVE_ASPELL_ASPELL_H) #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) check_include_files(locale.h HAVE_LOCALE_H) -check_include_files(process.h HAVE_PROCESS_H) check_include_files(stdlib.h HAVE_STDLIB_H) check_include_files(sys/stat.h HAVE_SYS_STAT_H) check_include_files(sys/time.h HAVE_SYS_TIME_H) @@ -39,7 +37,6 @@ check_include_files(unistd.h HAVE_UNISTD_H) check_include_files(inttypes.h HAVE_INTTYPES_H) check_include_files(utime.h HAVE_UTIME_H) check_include_files(string.h HAVE_STRING_H) -check_include_files(strings.h HAVE_STRINGS_H) check_include_files(argz.h HAVE_ARGZ_H) @@ -59,8 +56,6 @@ check_function_exists(_getpid HAVE__GETPID) check_function_exists(mkdir HAVE_MKDIR) check_function_exists(_mkdir HAVE__MKDIR) check_function_exists(putenv HAVE_PUTENV) -check_function_exists(mktemp HAVE_MKTEMP) -check_function_exists(mkstemp HAVE_MKSTEMP) check_function_exists(fcntl HAVE_FCNTL) check_function_exists(strerror HAVE_STRERROR) check_function_exists(getcwd HAVE_GETCWD) @@ -113,15 +108,6 @@ check_type_size(wint_t HAVE_WINT_T) # " #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 diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake index 54f48fe89e..ce2b34ee8e 100644 --- a/development/cmake/configCompiler.h.cmake +++ b/development/cmake/configCompiler.h.cmake @@ -13,10 +13,8 @@ #define _CONFIG_COMPILER_H -#cmakedefine HAVE_IO_H 1 #cmakedefine HAVE_LIMITS_H 1 #cmakedefine HAVE_LOCALE_H 1 -#cmakedefine HAVE_PROCESS_H 1 #cmakedefine HAVE_STDLIB_H 1 #cmakedefine HAVE_SYS_STAT_H 1 #cmakedefine HAVE_SYS_TIME_H 1 @@ -27,7 +25,6 @@ #cmakedefine HAVE_INTTYPES_H 1 #cmakedefine HAVE_UTIME_H 1 #cmakedefine HAVE_STRING_H 1 -#cmakedefine HAVE_STRINGS_H 1 #cmakedefine HAVE_ISTREAM 1 #cmakedefine HAVE_OSTREAM 1 #cmakedefine HAVE_IOS 1 @@ -48,8 +45,6 @@ #cmakedefine HAVE_MKDIR 1 #cmakedefine HAVE__MKDIR 1 #cmakedefine HAVE_PUTENV 1 -#cmakedefine HAVE_MKTEMP 1 -#cmakedefine HAVE_MKSTEMP 1 #cmakedefine HAVE_STRERROR 1 #cmakedefine HAVE_STD_COUNT 1 #cmakedefine HAVE_ASPRINTF 1 @@ -59,7 +54,6 @@ #cmakedefine HAVE_FCNTL 1 #cmakedefine HAVE_INTMAX_T 1 #cmakedefine HAVE_INTTYPES_H_WITH_UINTMAX 1 -#cmakedefine HAVE_DECL_ISTREAMBUF_ITERATOR 1 #cmakedefine CXX_GLOBAL_CSTD 1 #cmakedefine HAVE_GETCWD 1 #cmakedefine HAVE_STPCPY 1 -- 2.39.2