Cleanup CMake rules:

+ Add the option for building with hidden visibility.
+ Use the result of long files support tests instead of hard-coded definition.
+ Add the presence test TDEIO::UDS_HIDDEN.
+ Remove unnecessary tests.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

CMakeLists.txt

@@ -45,6 +45,12 @@ include( TDESetupPaths )
 tde_setup_paths( )
 
 
+##### optional stuff
+
+option( WITH_ALL_OPTIONS    "Enable all optional support" OFF )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
 ##### user requested modules ####################
 
 option( BUILD_ALL "Build all" OFF )
@@ -59,10 +65,7 @@ include( ConfigureChecks.cmake )
 
 ###### global compiler settings #################
 
-add_definitions(
+add_definitions( -DHAVE_CONFIG_H )
-  -DHAVE_CONFIG_H
-  -D_LARGEFILE64_SOURCE
-)
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )

ConfigureChecks.cmake

@@ -29,11 +29,18 @@ if( WITH_GCC_VISIBILITY )
 endif( WITH_GCC_VISIBILITY )
 
 
-check_type_size( "int" SIZEOF_INT BUILTIN_TYPES_ONLY )
+##### check for TDEIO::UDS_HIDDEN
-check_type_size( "long" SIZEOF_LONG BUILTIN_TYPES_ONLY )
+
-
+tde_save_and_set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} )
-check_include_file( stdint.h HAVE_STDINT_H )
+tde_save_and_set( CMAKE_REQUIRED_LIBRARIES tdeio-shared )
-check_include_file( systems.h HAVE_SYSTEMS_H )
+check_cxx_source_compiles( "
-check_include_file( linux/inotify.h HAVE_INOTIFY )
+    #include <tdeio/global.h>
-
+
-check_function_exists( statvfs HAVE_STATVFS )
+    int main()
+    {
+        int val = TDEIO::UDS_HIDDEN;
+        return 1;
+    }"
+    HAVE_UDS_HIDDEN
+)
+tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )

config.h.cmake

@@ -1,5 +1,10 @@
-#cmakedefine SIZEOF_INT @SIZEOF_INT@
+#define VERSION "@VERSION@"
-#cmakedefine SIZEOF_LONG @SIZEOF_LONG@
+
-#cmakedefine HAVE_STDINT_H 1
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
-#cmakedefine HAVE_SYSTEMS_H 1
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
-#cmakedefine HAVE_STATVFS 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
+
+#cmakedefine HAVE_UDS_HIDDEN 1