Setup gcc visibility and clean up cmake files. This resolves issue #22.HEADmaster

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 46 insertions, 45 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c45a5bf..e51f411 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-#################################################
+############################################
 #
 #  (C) 2011 Timothy Pearson
 #  kb9vqf (AT) pearsoncomputing.net
@@ -7,7 +7,7 @@
 #
 #  This file is released under GPL >= 2
 #
-#################################################
+############################################
 
 
 ##### set project version ########################
@@ -16,30 +16,13 @@ include( TDEVersion )
 cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
 tde_set_project_version( )
 
-##### cpack configuration #######################
 
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-set(CPACK_GENERATOR "DEB;RPM;TGZ")
-set(DEBIAN_PACKAGE_DESCRIPTION "QtCurve for TQt/TDE")
-set(DEBIAN_PACKAGE_SECTION "tde")
-set(CPACK_SOURCE_GENERATOR "TBZ2")
-set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "8")
-set(CPACK_PACKAGE_VERSION_PATCH "5")
-set(CPACK_PACKAGE_CONTACT "Craig Drummond <craig.p.drummond@gmail.com>")
-set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
-set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
-include(CPack)
-
-
-##### general package setup #####################
+#### general package setup
 
 project( tde-style-qtcurve )
 
 
-##### include essential cmake modules ###########
+#### include essential cmake modules
 
 include( CheckCXXSourceCompiles )
 include( CheckFunctionExists )
@@ -51,58 +34,67 @@ include( CheckTypeSize )
 include( FindPkgConfig )
 
 
-##### include our cmake modules #################
+#### include our cmake modules
 
 include( TDEMacros )
 
 
-##### setup install paths #######################
+##### setup install paths
 
 include( TDESetupPaths )
 tde_setup_paths( )
 
 
-##### user requested modules ####################
+##### optional stuff
+
+option( WITH_ALL_OPTIONS       "Enable all optional support"      ON )
+
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
 
-option( BUILD_ALL "Build all" OFF )
+option( BUILD_ALL "Build all" ON )
 option( BUILD_CONFIG_MODULE "Build TDE configuration module" ${BUILD_ALL} )
 option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
 
 
-##### configure checks ##########################
+##### configure checks
 
 include( ConfigureChecks.cmake )
 
 
-###### global compiler settings #################
+###### global compiler settings
 
-add_definitions(
-  -DHAVE_CONFIG_H
-)
+add_definitions( -DHAVE_CONFIG_H )
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
 set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
 
+if ( TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT )
+  message("**************************************************************\n"
+          "Warning: You have enabled support for the 'fix parentless dialogs'\n"
+          "         option. This is known to BREAK some applications. Please\n"
+          "         DO NOT report errors to application authors when you have\n"
+          "         this enabled. Please reconsider DISABLING this option.\n"
+          "**************************************************************\n")
+endif()
 
-##### source directories ########################
+
+##### directories
 
 add_subdirectory( style )
 add_subdirectory( themes )
 add_subdirectory( colors )
+
+
+##### other data ################################
+
 tde_conditional_add_subdirectory( BUILD_CONFIG_MODULE config )
 tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
 
 
-##### write configure files #####################
+##### write configure files
 
 configure_file( config.h.cmake config.h @ONLY )
-
-if (TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT)
-    message("**************************************************************\n"
-            "Warning: You have enabled support for the 'fix parentless dialogs'\n"
-            "         option. This is known to BREAK some applications. Please\n"
-            "         DO NOT report errors to application authors when you have\n"
-            "         this enabled. Please reconsider DISABLING this option.\n"
-            "**************************************************************\n")
-endif (TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT)
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 2b4b88f..0e57d4f 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -1,4 +1,4 @@
-#################################################
+###########################################
 #
 #  (C) 2010 Serghei Amelian
 #  serghei (DOT) amelian (AT) gmail.com
@@ -7,7 +7,7 @@
 #
 #  This file is released under GPL >= 2
 #
-#################################################
+###########################################
 
 
 # required stuff
diff --git a/config.h.cmake b/config.h.cmake
index 392c3fe..0dcbeb3 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,3 +1,12 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __TDE_HAVE_GCC_VISIBILITY 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@
+
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
diff --git a/config/qtcurveconfig.cpp b/config/qtcurveconfig.cpp
index 49b9508..c28f2e3 100644
--- a/config/qtcurveconfig.cpp
+++ b/config/qtcurveconfig.cpp
@@ -62,7 +62,7 @@
 
 extern "C"
 {
-    TQWidget * allocate_tdestyle_config(TQWidget *parent)
+    TDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget *parent)
     {
         TDEGlobal::locale()->insertCatalogue("qtcurve");
         return new QtCurveConfig(parent);
diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp
index 01ec4d1..c530359 100644
--- a/style/qtcurve.cpp
+++ b/style/qtcurve.cpp
@@ -50,7 +50,7 @@
 /*
 TDEHTML
 -----
-Srollbars:
+Scrollbars:
 
 For some reason Scrollbars in TDEHTML seem to lose the bottom/left pixels. As if TDEHTML expects
 the scrollbar to be 1 pixel smaller/thinner than it actually is. To 'fix' this, the pixelMetric