summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-30 21:21:00 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-30 21:28:18 (GMT)
commitb5dc725832839986048f64ced12c6491cdb954a1 (patch)
tree4e3693145f37ceea6214b0b57032725b2bdae533
parent6aab8e9ddfe7698f685058310c56120005d95f83 (diff)
Only export symbols from the libraries that should be exported
Summary: Using generate_export_header instead manually written export headers should improve coverage across platforms. Size of stripped libmarblewidget-qt5 reduced on Linux e.g. from 11077592 to 7889848 Reviewers: rahn, #marble, nienhueser Reviewed By: #marble, nienhueser Differential Revision: https://phabricator.kde.org/D2309
-rw-r--r--CMakeLists.txt7
-rw-r--r--src/apps/behaim/main.cpp6
-rw-r--r--src/apps/marble-maps/main.cpp6
-rw-r--r--src/lib/astro/CMakeLists.txt3
-rw-r--r--src/lib/marble/AbstractFloatItem.h6
-rw-r--r--src/lib/marble/CMakeLists.txt10
-rw-r--r--src/lib/marble/MarbleDBusInterface.h4
-rw-r--r--src/lib/marble/Planet.h15
-rw-r--r--src/lib/marble/Quaternion.h1
-rw-r--r--src/lib/marble/StyleBuilder.h6
-rw-r--r--src/lib/marble/declarative/CMakeLists.txt6
-rw-r--r--src/lib/marble/declarative/marble_declarative_export.h24
-rw-r--r--src/lib/marble/geodata/data/GeoDataContainer.h2
-rw-r--r--src/lib/marble/geodata/geodata_export.h22
-rw-r--r--src/lib/marble/marble_export.h33
-rw-r--r--src/lib/marble/routing/instructions/RoutingPoint.h2
-rw-r--r--src/plugins/positionprovider/geoclue/GeoCute/CMakeLists.txt2
-rw-r--r--tools/constellations2kml/CMakeLists.txt1
-rw-r--r--tools/dateline/CMakeLists.txt1
-rw-r--r--tools/kml2cache/CMakeLists.txt1
-rw-r--r--tools/kml2kml/CMakeLists.txt1
-rw-r--r--tools/mapreproject/CMakeLists.txt1
-rw-r--r--tools/maptheme-previewimage/CMakeLists.txt1
-rw-r--r--tools/osm-addresses/CMakeLists.txt1
-rw-r--r--tools/osm-simplify/CMakeLists.txt5
-rw-r--r--tools/osm-sisyphus/CMakeLists.txt1
-rw-r--r--tools/poly2kml/CMakeLists.txt1
-rw-r--r--tools/routing-instructions/CMakeLists.txt1
-rw-r--r--tools/shp2pn2/CMakeLists.txt1
-rw-r--r--tools/tilecreator-srtm2/CMakeLists.txt2
-rw-r--r--tools/tilecreator/CMakeLists.txt1
31 files changed, 60 insertions, 114 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7944f28..092c033 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STRE
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
endif()
+# Default to hidden visibility for symbols
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+if (POLICY CMP0063)
+ cmake_policy(SET CMP0063 NEW)
+endif()
####################################################
# Where to look first for cmake modules,
diff --git a/src/apps/behaim/main.cpp b/src/apps/behaim/main.cpp
index 9286583..5a6c0d4 100644
--- a/src/apps/behaim/main.cpp
+++ b/src/apps/behaim/main.cpp
@@ -17,6 +17,12 @@
using namespace Marble;
+#ifdef Q_OS_ANDROID
+// Declare symbol of main method as exported as needed by Qt-on-Android,
+// where the Dalvik-native QtActivity class needs to find and invoke it
+// on loading the "app" module
+extern "C" Q_DECL_EXPORT
+#endif
int main(int argc, char ** argv)
{
QApplication app(argc, argv);
diff --git a/src/apps/marble-maps/main.cpp b/src/apps/marble-maps/main.cpp
index 9107ad1..cce612f 100644
--- a/src/apps/marble-maps/main.cpp
+++ b/src/apps/marble-maps/main.cpp
@@ -19,6 +19,12 @@
using namespace Marble;
+#ifdef Q_OS_ANDROID
+// Declare symbol of main method as exported as needed by Qt-on-Android,
+// where the Dalvik-native QtActivity class needs to find and invoke it
+// on loading the "app" module
+extern "C" Q_DECL_EXPORT
+#endif
int main(int argc, char ** argv)
{
QApplication app(argc, argv);
diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt
index 2ad4b0a..64cfaa5 100644
--- a/src/lib/astro/CMakeLists.txt
+++ b/src/lib/astro/CMakeLists.txt
@@ -39,9 +39,6 @@ if(WIN32)
endif(WIN32)
-SET_TARGET_PROPERTIES(astro PROPERTIES
- DEFINE_SYMBOL astro_EXPORTS # needed for astrolib_export.h
- )
if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
SET_TARGET_PROPERTIES(astro PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
diff --git a/src/lib/marble/AbstractFloatItem.h b/src/lib/marble/AbstractFloatItem.h
index f6d28e3..e3f317b 100644
--- a/src/lib/marble/AbstractFloatItem.h
+++ b/src/lib/marble/AbstractFloatItem.h
@@ -85,9 +85,9 @@ class MARBLE_EXPORT AbstractFloatItem : public RenderPlugin, public FrameGraphic
* @deprecated Do not override this method since it won't be called any longer.
* Override one of FrameGraphicsItem's paint methods instead.
*/
- MARBLE_DEPRECATED( bool render( GeoPainter *painter, ViewportParams *viewport,
+ MARBLE_DEPRECATED bool render( GeoPainter *painter, ViewportParams *viewport,
const QString& renderPos = QLatin1String("FLOAT_ITEM"),
- GeoSceneLayer * layer = 0 ) override );
+ GeoSceneLayer * layer = 0 ) override;
QString renderPolicy() const override;
@@ -96,7 +96,7 @@ class MARBLE_EXPORT AbstractFloatItem : public RenderPlugin, public FrameGraphic
* @deprecated The return value of method is ignored. The float item's rendering position
* will always be "FLOAT_ITEM".
*/
- MARBLE_DEPRECATED( QStringList renderPosition() const override );
+ MARBLE_DEPRECATED QStringList renderPosition() const override;
/**
* @brief Set visibility of the float item
diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
index 0bffad8..37db8d4 100644
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@ -361,6 +361,9 @@ qt_wrap_ui(marblewidget_SRCS ${marblewidget_UI})
ADD_LIBRARY(${MARBLEWIDGET} SHARED ${marblewidget_SRCS} ${SOURCES_UI_HDRS})
+generate_export_header(${MARBLEWIDGET} BASE_NAME marble)
+
+
# TODO: use PUBLIC/PRIVATE everywhere instead of LINK_PUBLIC/LINK_PRIVATE
# once SailfishOS has cmake >= 2.8.12
@@ -427,11 +430,6 @@ endif()
set_target_properties(${MARBLEWIDGET} PROPERTIES
COMPILE_FLAGS "-DKML_LAZY_IMP")
-# needed for marble_export.h
-set_target_properties(${MARBLEWIDGET} PROPERTIES
- DEFINE_SYMBOL MAKE_MARBLE_LIB
-)
-
# choose the correct target install library path
if(WIN32)
install(TARGETS ${MARBLEWIDGET} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib)
@@ -457,6 +455,7 @@ else()
endif()
install( FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/marble_export.h
${graphicsview_HDRS}
${marble_WebKit}
AutoNavigation.h
@@ -578,7 +577,6 @@ install( FILES
LayerInterface.h
RenderState.h
PluginAboutDialog.h
- marble_export.h
Planet.h
PlanetFactory.h
EditPlacemarkDialog.h
diff --git a/src/lib/marble/MarbleDBusInterface.h b/src/lib/marble/MarbleDBusInterface.h
index 469e320..2d65959 100644
--- a/src/lib/marble/MarbleDBusInterface.h
+++ b/src/lib/marble/MarbleDBusInterface.h
@@ -11,6 +11,8 @@
#ifndef MARBLE_DBUSINTERFACE_H
#define MARBLE_DBUSINTERFACE_H
+#include "marble_export.h"
+
namespace Marble
{
class MarbleWidget;
@@ -23,7 +25,7 @@ namespace Marble
namespace Marble {
-class MarbleDBusInterface : public QDBusAbstractAdaptor
+class MARBLE_EXPORT MarbleDBusInterface : public QDBusAbstractAdaptor
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.kde.marble")
diff --git a/src/lib/marble/Planet.h b/src/lib/marble/Planet.h
index 7a9a553..26a7b44 100644
--- a/src/lib/marble/Planet.h
+++ b/src/lib/marble/Planet.h
@@ -34,7 +34,10 @@ public:
*/
Planet();
- MARBLE_DEPRECATED( explicit Planet( const QString& id ) ); // please use PlanetFactory::construct(id) instead
+ /**
+ * @deprecated Please use PlanetFactory::construct(id) instead.
+ */
+ MARBLE_DEPRECATED explicit Planet(const QString& id);
///Copy Constructor
Planet( const Planet& other );
@@ -97,8 +100,14 @@ public:
Planet& operator=( const Planet& rhs );
- MARBLE_DEPRECATED( static QString name( const QString& id ) ); // please use PlanetFactory::localizedName(id) instead
- MARBLE_DEPRECATED( static QStringList planetList() ); // please use PlanetFactory::planetList() instead
+ /**
+ * @deprecated Please use PlanetFactory::localizedName(id) instead.
+ */
+ MARBLE_DEPRECATED static QString name(const QString& id);
+ /**
+ * @deprecated Please use PlanetFactory::planetList() instead.
+ */
+ MARBLE_DEPRECATED static QStringList planetList();
bool hasAtmosphere() const;
void setHasAtmosphere( bool enabled );
diff --git a/src/lib/marble/Quaternion.h b/src/lib/marble/Quaternion.h
index cdb6b13..7e588ea 100644
--- a/src/lib/marble/Quaternion.h
+++ b/src/lib/marble/Quaternion.h
@@ -21,6 +21,7 @@
#include "marble_export.h"
#include <cmath>
+#include <QtGlobal>
namespace Marble
{
diff --git a/src/lib/marble/StyleBuilder.h b/src/lib/marble/StyleBuilder.h
index 21bb4af..d566a6f 100644
--- a/src/lib/marble/StyleBuilder.h
+++ b/src/lib/marble/StyleBuilder.h
@@ -14,13 +14,15 @@
#include <GeoDataStyle.h>
#include <GeoDataFeature.h>
+#include "marble_export.h"
+
class QFont;
class QColor;
namespace Marble {
class OsmPlacemarkData;
-class StyleParameters
+class MARBLE_EXPORT StyleParameters
{
public:
explicit StyleParameters(const GeoDataFeature* feature=nullptr, int tileLevel=0);
@@ -29,7 +31,7 @@ public:
int tileLevel;
};
-class StyleBuilder
+class MARBLE_EXPORT StyleBuilder
{
public:
StyleBuilder();
diff --git a/src/lib/marble/declarative/CMakeLists.txt b/src/lib/marble/declarative/CMakeLists.txt
index 867821c..1f68fd8 100644
--- a/src/lib/marble/declarative/CMakeLists.txt
+++ b/src/lib/marble/declarative/CMakeLists.txt
@@ -32,10 +32,8 @@ add_library( marbledeclarative SHARED
Settings.cpp
)
-# needed for marble_declarative_export.h
-set_target_properties(marbledeclarative PROPERTIES
- DEFINE_SYMBOL MAKE_MARBLE_DECLARATIVE_LIB
-)
+generate_export_header(marbledeclarative BASE_NAME marble_declarative)
+target_include_directories(marbledeclarative PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
marble_add_project_resources(qmldir)
diff --git a/src/lib/marble/declarative/marble_declarative_export.h b/src/lib/marble/declarative/marble_declarative_export.h
deleted file mode 100644
index 6a73e6c..0000000
--- a/src/lib/marble/declarative/marble_declarative_export.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// This file is part of the Marble Virtual Globe.
-//
-// This program is free software licensed under the GNU LGPL. You can
-// find a copy of this license in LICENSE.txt in the top directory of
-// the source code.
-//
-// Copyright 2007 Christian Ehrlicher <ch.ehrlicher@gmx.de>
-//
-
-#ifndef MARBLE_DECLARATIVE_EXPORT_H
-#define MARBLE_DECLARATIVE_EXPORT_H
-
-#include <QtGlobal>
-
-#ifndef MARBLE_DECLARATIVE_EXPORT
-# ifdef MAKE_MARBLE_DECLARATIVE_LIB
-# define MARBLE_DECLARATIVE_EXPORT Q_DECL_EXPORT
-# else
-# define MARBLE_DECLARATIVE_EXPORT Q_DECL_IMPORT
-# endif
-#endif
-
-#endif // MARBLE_DECLARATIVE_EXPORT_H
diff --git a/src/lib/marble/geodata/data/GeoDataContainer.h b/src/lib/marble/geodata/data/GeoDataContainer.h
index 6f54d76..81a4485 100644
--- a/src/lib/marble/geodata/data/GeoDataContainer.h
+++ b/src/lib/marble/geodata/data/GeoDataContainer.h
@@ -107,7 +107,7 @@ class GEODATA_EXPORT GeoDataContainer : public GeoDataFeature
*/
void insert( int index, GeoDataFeature *feature );
- GEODATA_DEPRECATED( void insert( GeoDataFeature *other, int index ) );
+ GEODATA_DEPRECATED void insert(GeoDataFeature *other, int index);
/**
* @brief add an element
diff --git a/src/lib/marble/geodata/geodata_export.h b/src/lib/marble/geodata/geodata_export.h
index 7f20229..d5876dd 100644
--- a/src/lib/marble/geodata/geodata_export.h
+++ b/src/lib/marble/geodata/geodata_export.h
@@ -12,24 +12,10 @@
#ifndef GEODATA_EXPORT_H
#define GEODATA_EXPORT_H
-#include <QtGlobal>
+#include "marble_export.h"
-// please make sure to change MAKE_MARBLE_LIB to MAKE_GEODATA_LIB if geodata is an independent library
-#ifndef GEODATA_EXPORT
-# ifdef MAKE_MARBLE_LIB
-# define GEODATA_EXPORT Q_DECL_EXPORT
-# else
-# define GEODATA_EXPORT Q_DECL_IMPORT
-# endif
-#endif
-
-#ifdef __GNUC__
-#define GEODATA_DEPRECATED(func) func __attribute__ ((deprecated))
-#elif defined(_MSC_VER)
-#define GEODATA_DEPRECATED(func) __declspec(deprecated) func
-#else
-#pragma message("WARNING: You need to implement GEODATA_DEPRECATED for this compiler in geodata_export.h")
-#define GEODATA_DEPRECATED(func) func
-#endif
+// please make sure to create a real export-header if geodata becomes an independent library
+#define GEODATA_EXPORT MARBLE_EXPORT
+#define GEODATA_DEPRECATED MARBLE_DEPRECATED
#endif // GEODATA_EXPORT_H
diff --git a/src/lib/marble/marble_export.h b/src/lib/marble/marble_export.h
deleted file mode 100644
index 77a769a..0000000
--- a/src/lib/marble/marble_export.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// This file is part of the Marble Virtual Globe.
-//
-// This program is free software licensed under the GNU LGPL. You can
-// find a copy of this license in LICENSE.txt in the top directory of
-// the source code.
-//
-// Copyright 2007 Christian Ehrlicher <ch.ehrlicher@gmx.de>
-//
-
-#ifndef MARBLE_EXPORT_H
-#define MARBLE_EXPORT_H
-
-#include <QtGlobal>
-
-#ifndef MARBLE_EXPORT
-# ifdef MAKE_MARBLE_LIB
-# define MARBLE_EXPORT Q_DECL_EXPORT
-# else
-# define MARBLE_EXPORT Q_DECL_IMPORT
-# endif
-#endif
-
-#ifdef __GNUC__
-#define MARBLE_DEPRECATED(func) func __attribute__ ((deprecated))
-#elif defined(_MSC_VER)
-#define MARBLE_DEPRECATED(func) __declspec(deprecated) func
-#else
-#pragma message("WARNING: You need to implement MARBLE_DEPRECATED for this compiler in marble_export.h")
-#define MARBLE_DEPRECATED(func) func
-#endif
-
-#endif // MARBLE_EXPORT_H
diff --git a/src/lib/marble/routing/instructions/RoutingPoint.h b/src/lib/marble/routing/instructions/RoutingPoint.h
index 8a38a09..8900096 100644
--- a/src/lib/marble/routing/instructions/RoutingPoint.h
+++ b/src/lib/marble/routing/instructions/RoutingPoint.h
@@ -13,6 +13,8 @@
#include "marble_export.h"
+#include <QtGlobal>
+
class QTextStream;
namespace Marble
diff --git a/src/plugins/positionprovider/geoclue/GeoCute/CMakeLists.txt b/src/plugins/positionprovider/geoclue/GeoCute/CMakeLists.txt
index a77174e..377c642 100644
--- a/src/plugins/positionprovider/geoclue/GeoCute/CMakeLists.txt
+++ b/src/plugins/positionprovider/geoclue/GeoCute/CMakeLists.txt
@@ -16,5 +16,3 @@ set(GeoCute_SRCS
)
add_library(GeoCute SHARED ${GeoCute_SRCS})
-
-set_target_properties(GeoCute PROPERTIES DEFINE_SYMBOL MAKE_GEOCUTE_LIB)
diff --git a/tools/constellations2kml/CMakeLists.txt b/tools/constellations2kml/CMakeLists.txt
index 3ed5a1e..8832036 100644
--- a/tools/constellations2kml/CMakeLists.txt
+++ b/tools/constellations2kml/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
)
set( ${TARGET}_SRC constellations2kml.cpp )
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
diff --git a/tools/dateline/CMakeLists.txt b/tools/dateline/CMakeLists.txt
index 57a6baf..9ed68f6 100644
--- a/tools/dateline/CMakeLists.txt
+++ b/tools/dateline/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
)
set( ${TARGET}_SRC dateline.cpp )
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
diff --git a/tools/kml2cache/CMakeLists.txt b/tools/kml2cache/CMakeLists.txt
index 962cd78..fa5ccff 100644
--- a/tools/kml2cache/CMakeLists.txt
+++ b/tools/kml2cache/CMakeLists.txt
@@ -7,6 +7,5 @@ include_directories(
)
set( ${TARGET}_SRC kml2cache.cpp )
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
diff --git a/tools/kml2kml/CMakeLists.txt b/tools/kml2kml/CMakeLists.txt
index f0d5a63..5827087 100644
--- a/tools/kml2kml/CMakeLists.txt
+++ b/tools/kml2kml/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
)
set( ${TARGET}_SRC kml2kml.cpp )
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
diff --git a/tools/mapreproject/CMakeLists.txt b/tools/mapreproject/CMakeLists.txt
index c322835..9745204 100644
--- a/tools/mapreproject/CMakeLists.txt
+++ b/tools/mapreproject/CMakeLists.txt
@@ -20,7 +20,6 @@ NearestNeighborInterpolation.cpp
NasaWorldWindToOpenStreetMapConverter.cpp
main.cpp
)
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
diff --git a/tools/maptheme-previewimage/CMakeLists.txt b/tools/maptheme-previewimage/CMakeLists.txt
index 773b9de..6013884 100644
--- a/tools/maptheme-previewimage/CMakeLists.txt
+++ b/tools/maptheme-previewimage/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(
set( ${TARGET}_SRC main.cpp )
QT_ADD_RESOURCES( RESOURCES canvas.qrc )
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} ${RESOURCES} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
diff --git a/tools/osm-addresses/CMakeLists.txt b/tools/osm-addresses/CMakeLists.txt
index cef776c..0e88b74 100644
--- a/tools/osm-addresses/CMakeLists.txt
+++ b/tools/osm-addresses/CMakeLists.txt
@@ -25,7 +25,6 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS
pbf/fileformat.proto
pbf/osmformat.proto
)
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} ${PROTO_SRCS} ${PROTO_HDRS} )
target_link_libraries( ${TARGET} ${PROTOBUF_LIBRARIES} ${ZLIB_LIBRARIES} )
diff --git a/tools/osm-simplify/CMakeLists.txt b/tools/osm-simplify/CMakeLists.txt
index 4220eb7..9160258 100644
--- a/tools/osm-simplify/CMakeLists.txt
+++ b/tools/osm-simplify/CMakeLists.txt
@@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.8.12)
SET (TARGET osm-simplify)
PROJECT (${TARGET})
+if (POLICY CMP0063)
+ cmake_policy(SET CMP0063 NEW)
+endif()
+
find_package(Qt5Core REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Gui REQUIRED)
@@ -32,7 +36,6 @@ BaseFilter.cpp
WayChunk.cpp
)
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} Qt5::Core marblewidget-qt5)
diff --git a/tools/osm-sisyphus/CMakeLists.txt b/tools/osm-sisyphus/CMakeLists.txt
index 0b69274..89ca955 100644
--- a/tools/osm-sisyphus/CMakeLists.txt
+++ b/tools/osm-sisyphus/CMakeLists.txt
@@ -16,7 +16,6 @@ upload.cpp
region.cpp
main.cpp
)
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} Qt5::Sql marblewidget-qt5 )
diff --git a/tools/poly2kml/CMakeLists.txt b/tools/poly2kml/CMakeLists.txt
index 960e07b..a77bbc5 100644
--- a/tools/poly2kml/CMakeLists.txt
+++ b/tools/poly2kml/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
)
set( ${TARGET}_SRC main.cpp )
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
diff --git a/tools/routing-instructions/CMakeLists.txt b/tools/routing-instructions/CMakeLists.txt
index fe386b9..9a189ba 100644
--- a/tools/routing-instructions/CMakeLists.txt
+++ b/tools/routing-instructions/CMakeLists.txt
@@ -13,7 +13,6 @@ set( routing-instructions_SRC
main.cpp
)
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( routing-instructions ${routing-instructions_SRC} )
target_link_libraries( routing-instructions Qt5::Core )
diff --git a/tools/shp2pn2/CMakeLists.txt b/tools/shp2pn2/CMakeLists.txt
index 083e0dc..7e75894 100644
--- a/tools/shp2pn2/CMakeLists.txt
+++ b/tools/shp2pn2/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
)
set( ${TARGET}_SRC shp2pn2.cpp )
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
diff --git a/tools/tilecreator-srtm2/CMakeLists.txt b/tools/tilecreator-srtm2/CMakeLists.txt
index 42a78de..0c0c6f9 100644
--- a/tools/tilecreator-srtm2/CMakeLists.txt
+++ b/tools/tilecreator-srtm2/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
)
set( ${TARGET}_SRC main.cpp tccore.cpp )
-add_definitions( -DMAKE_MARBLE_LIB -DTILECREATOR )
+add_definitions(-DTILECREATOR)
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )
diff --git a/tools/tilecreator/CMakeLists.txt b/tools/tilecreator/CMakeLists.txt
index 7a859d7..7d39b9b 100644
--- a/tools/tilecreator/CMakeLists.txt
+++ b/tools/tilecreator/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
)
set( ${TARGET}_SRC main.cpp tccore.cpp )
-add_definitions( -DMAKE_MARBLE_LIB )
add_executable( ${TARGET} ${${TARGET}_SRC} )
target_link_libraries( ${TARGET} marblewidget-qt5 )