X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FConfigureChecks.cmake;h=144ddab075096a7a009d0f6f953b4856642eacef;hb=38f9e35ab1f4e6e14486fbd223160b8e0fd5993d;hp=1974b22fdc12c82c9c4f2883b2c970a300d00bda;hpb=ee07d30cbf3102e1adcf36d438fa5816084ec917;p=lyx.git

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 1974b22fdc..144ddab075 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -1,3 +1,9 @@
+# This file is part of LyX, the document processor.
+# Licence details can be found in the file COPYING.
+#
+# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
+#
+
 include(CheckIncludeFile)
 include(CheckIncludeFileCXX)
 include(CheckIncludeFiles)
@@ -35,6 +41,7 @@ check_include_files(argz.h HAVE_ARGZ_H)
 
 
 check_function_exists(open HAVE_OPEN)
+check_function_exists(chmod HAVE_CHMOD)
 check_function_exists(close HAVE_CLOSE)
 check_function_exists(popen HAVE_POPEN)
 check_function_exists(pclose HAVE_PCLOSE)
@@ -115,15 +122,28 @@ check_cxx_source_compiles(
 	"
 CXX_GLOBAL_CSTD)
 
-set(PACKAGE lyx)
-set(PACKAGE_VERSION 1.5.0svn)
+check_cxx_source_compiles(
+	"
+	#include <iconv.h>
+	// this declaration will fail when there already exists a non const char** version which returns size_t
+	double iconv(iconv_t cd,  char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+	int main() { return 0; }
+	"
+HAVE_ICONV_CONST)
 
-if(WIN32)
-	set(USE_WINDOWS_PACKAGING 1)
-else(WIN32)
-	set(USE_POSIX_PACKAGING 1)
-endif(WIN32)
+check_cxx_source_compiles(
+	"
+	int i[ ( sizeof(wchar_t)==2 ? 1 : -1 ) ];
+	int main(){return 0;}
+	"
+SIZEOF_WCHAR_T_IS_2)
 
+check_cxx_source_compiles(
+	"
+	int i[ ( sizeof(wchar_t)==4 ? 1 : -1 ) ];
+	int main(){return 0;}
+	"
+SIZEOF_WCHAR_T_IS_4)