Merge branch 'master' of github.com:ufz/ogs

BaseLib/Configure.h.in

@@ -12,6 +12,27 @@
  #ifndef CONFIGURE_H
  #define CONFIGURE_H
 
+// Type sizes
+#cmakedefine SIZEOF_INT ${SIZEOF_INT}
+#cmakedefine SIZEOF_LONG ${SIZEOF_LONG}
+#cmakedefine SIZEOF_LONG_LONG ${SIZEOF_LONG_LONG}
+#cmakedefine SIZEOF_VOID_P ${SIZEOF_VOID_P}
+
+// Has includes?
+#cmakedefine HAVE_DLFCN_H
+#cmakedefine HAVE_INTTYPES_H
+#cmakedefine HAVE_MALLOC_H
+#cmakedefine HAVE_MEMORY_H
+#cmakedefine HAVE_STDINT_H
+#cmakedefine HAVE_STDLIB_H
+#cmakedefine HAVE_STRINGS_H
+#cmakedefine HAVE_STRING_H
+#cmakedefine HAVE_SYS_STAT_H
+#cmakedefine HAVE_SYS_TIME_H
+#cmakedefine HAVE_SYS_TYPES_H
+#cmakedefine HAVE_UNISTD_H
+#cmakedefine HAVE_SYS_MOUNT_H
+
 #define SOURCEPATH "${CMAKE_SOURCE_DIR}"
 
 #cmakedefine OGS_VERSION "${OGS_VERSION}"

CMakeLists.txt

@@ -9,6 +9,8 @@ cmake_minimum_required(VERSION 2.6)
 project( OGS-6 )
 
 ### CMake includes ###
+INCLUDE(scripts/cmake/CheckTypeSizes.cmake)
+INCLUDE(scripts/cmake/FindIncludeHeader.cmake)
 INCLUDE(scripts/cmake/Functions.cmake)
 INCLUDE(scripts/cmake/CMakeSetup.cmake)
 INCLUDE(scripts/cmake/CompilerSetup.cmake)

FileIO/XmlIO/XMLInterface.cpp

@@ -17,10 +17,9 @@
 
 #include <QCryptographicHash>
 #include <QFileInfo>
-#ifdef QT_USE_QTXMLPATTERNS
 #include <QtXmlPatterns/QXmlSchema>
 #include <QtXmlPatterns/QXmlSchemaValidator>
-#endif // QT_USE_QTXMLPATTERNS
+
 
 namespace FileIO
 {
@@ -32,7 +31,6 @@ XMLInterface::XMLInterface(ProjectData* project, const std::string &schemaFile)
 
 int XMLInterface::isValid(const QString &fileName) const
 {
-#ifdef QT_USE_QTXMLPATTERNS
 	QXmlSchema schema;
 	schema.load( QUrl::fromLocalFile((QString::fromStdString(_schemaName))) );
 
@@ -55,13 +53,6 @@ int XMLInterface::isValid(const QString &fileName) const
 		" is invalid." << std::endl;
 		return 0;
 	}
-#else // ifdef QT_USE_QTXMLPATTERNS
-	Q_UNUSED (fileName);
-	std::cout <<
-	"XMLInterface: XML schema validation skipped. Qt 4.6 is required for validation." <<
-	std::endl;
-	return 1;
-#endif // QT_USE_QTXMLPATTERNS
 }
 
 void XMLInterface::setSchema(const std::string &schemaName)

scripts/cmake/CheckTypeSizes.cmake

+INCLUDE (CheckTypeSize)
+
+CHECK_TYPE_SIZE(int SIZEOF_INT)
+CHECK_TYPE_SIZE(long SIZEOF_LONG)
+CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
+CHECK_TYPE_SIZE("void *" SIZEOF_VOID_P)
\ No newline at end of file

scripts/cmake/Find.cmake

@@ -39,9 +39,7 @@ IF ( QT4_FOUND )
 	SET(QT_USE_QTSQL TRUE)
 	SET(QT_USE_QTTEST TRUE)
 	SET(QT_USE_QTXML TRUE)
-	IF(QT_QTXMLPATTERNS_FOUND)
-		SET(QT_USE_QTXMLPATTERNS TRUE)
-	ENDIF(QT_QTXMLPATTERNS_FOUND)
+	SET(QT_USE_QTXMLPATTERNS TRUE)
 	INCLUDE( ${QT_USE_FILE} )
 	ADD_DEFINITIONS(${QT_DEFINITIONS})
 ENDIF (QT4_FOUND )

scripts/cmake/FindIncludeHeader.cmake

+INCLUDE (CheckIncludeFiles)
+
+CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
+CHECK_INCLUDE_FILES (inttypes.h HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
+CHECK_INCLUDE_FILES (memory.h HAVE_MEMORY_H)
+CHECK_INCLUDE_FILES (stdint.h HAVE_STDINT_H)
+CHECK_INCLUDE_FILES (stdlib.h HAVE_STDLIB_H)
+CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)
+CHECK_INCLUDE_FILES (string.h HAVE_STRING_H)
+CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILES (sys/time.h HAVE_SYS_TIME_H)
+CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
+CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H)
\ No newline at end of file