#4 Fix GCC visibility, use common tests in CMake rules

Merged
SlavekB merged 2 commits from feat/cmakeCommonTests into master 1 year ago
  1. +11
    -0
      CMakeLists.txt
  2. +15
    -0
      ConfigureChecks.cmake
  3. +2
    -1
      tqdbusobjectpath.h
  4. +2
    -1
      tqdbusunixfd.h

+ 11
- 0
CMakeLists.txt View File

@@ -18,9 +18,20 @@ cmake_minimum_required( VERSION 2.8 )

include( FindPkgConfig )
include( CheckCXXSourceCompiles )
include( CheckSymbolExists )

set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )


##### optional stuff

option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )


##### configure checks ##########################

include( ConfigureChecks.cmake )




+ 15
- 0
ConfigureChecks.cmake View File

@@ -9,6 +9,16 @@
#
#################################################

##### setup architecture flags ##################

tde_setup_architecture_flags( )

include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)

tde_setup_largefiles( )


# dbus-1
pkg_search_module( DBUS dbus-1 )
if( NOT DBUS_FOUND )
@@ -17,3 +27,8 @@ endif( )

# tqt
find_package( TQt )

# gcc visibility
if( WITH_GCC_VISIBILITY )
tde_setup_gcc_visibility( )
endif( )

+ 2
- 1
tqdbusobjectpath.h View File

@@ -25,6 +25,7 @@
#define TQDBUSOBJECTPATH_H

#include <tqcstring.h>
#include "tqdbusmacros.h"

/**
* @brief Class for representing D-Bus object paths
@@ -35,7 +36,7 @@
*
* @see @ref dbusconventions-objectpath
*/
class TQT_DBusObjectPath : public TQCString
class TQDBUS_EXPORT TQT_DBusObjectPath : public TQCString
{
public:
/**


+ 2
- 1
tqdbusunixfd.h View File

@@ -28,6 +28,7 @@
#ifndef QT_H
#include "ntqshared.h"
#endif // QT_H
#include "tqdbusmacros.h"


#ifndef DBUS_TYPE_UNIX_FD
@@ -47,7 +48,7 @@
*
* @see @ref dbusconventions-unixfd
*/
class TQT_DBusUnixFd
class TQDBUS_EXPORT TQT_DBusUnixFd
{
public:
/**


Loading…
Cancel
Save