Add qgis_customwidgets with CUSTOMWIDGETS_EXPORT macro

2025-04-13 00:03:09 -04:00 · 2017-01-04 12:29:30 +01:00 · 2017-01-04 12:29:30 +01:00 · 2f35e16e2b
commit 2f35e16e2b
parent 1693140b1c
22 changed files with 32 additions and 9 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -581,8 +581,6 @@ ELSE (WIN32)

 ENDIF(WIN32)

-ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
-
 SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
 INCLUDE(GenerateExportHeader)

--- a/src/customwidgets/CMakeLists.txt
+++ b/src/customwidgets/CMakeLists.txt
@ -7,10 +7,6 @@ FIND_PACKAGE(Qt5Designer REQUIRED)

 SET(QT_USE_QTDESIGNER ON)

-
-REMOVE_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
-ADD_DEFINITIONS("\"-DCUSTOMWIDGETS_EXPORT=${DLLEXPORT}\"")
-
 ########################################################
 # Files

@ -107,6 +103,7 @@ INCLUDE_DIRECTORIES(
  ${CMAKE_CURRENT_SOURCE_DIR}/../gui/editorwidgets/
  ${CMAKE_CURRENT_SOURCE_DIR}/../gui/editorwidgets/core
  ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/customwidgets
  ${CMAKE_CURRENT_BINARY_DIR}/../ui/
 )
 INCLUDE_DIRECTORIES(SYSTEM
@ -126,9 +123,6 @@ QT5_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})

 ADD_LIBRARY(qgis_customwidgets SHARED ${QGIS_CUSTOMWIDGETS_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_SRCS} ${QGIS_CUSTOMWIDGETS_HDRS} ${IMAGE_RCC_SRCS})

-# TODO: apple
-INSTALL(FILES ${QGIS_CUSTOMWIDGETS_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
-
 SET_TARGET_PROPERTIES(qgis_customwidgets PROPERTIES
  VERSION ${COMPLETE_VERSION}
  SOVERSION ${COMPLETE_VERSION}
@ -139,8 +133,19 @@ ADD_DEPENDENCIES(qgis_customwidgets ui)

 TARGET_LINK_LIBRARIES(qgis_customwidgets qgis_gui)

+GENERATE_EXPORT_HEADER(
+   qgis_customwidgets
+   BASE_NAME CUSTOMWIDGETS
+   EXPORT_FILE_NAME qgis_customwidgets.h
+)
+
+SET(QGIS_CUSTOMWIDGETS_HDRS ${QGIS_CUSTOMWIDGETS_HDRS} ${PROJECT_BINARY_DIR}/qgis_customwidgets.h)
+
 # install
 INSTALL(TARGETS qgis_customwidgets
  RUNTIME DESTINATION ${QT_PLUGINS_DIR}/designer
  LIBRARY DESTINATION ${QT_PLUGINS_DIR}/designer
 )
+
+# TODO: apple
+INSTALL(FILES ${QGIS_CUSTOMWIDGETS_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
--- a/src/customwidgets/qgscollapsiblegroupboxplugin.h
+++ b/src/customwidgets/qgscollapsiblegroupboxplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif

 class CUSTOMWIDGETS_EXPORT QgsCollapsibleGroupBoxPlugin : public QObject, public QDesignerCustomWidgetInterface
--- a/src/customwidgets/qgscolorbuttonplugin.h
+++ b/src/customwidgets/qgscolorbuttonplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsdatadefinedbuttonplugin.h
+++ b/src/customwidgets/qgsdatadefinedbuttonplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsdatetimeeditplugin.h
+++ b/src/customwidgets/qgsdatetimeeditplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsdockwidgetplugin.h
+++ b/src/customwidgets/qgsdockwidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif

 class CUSTOMWIDGETS_EXPORT QgsDockWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
--- a/src/customwidgets/qgsdoublespinboxplugin.h
+++ b/src/customwidgets/qgsdoublespinboxplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsexpressionbuilderwidgetplugin.h
+++ b/src/customwidgets/qgsexpressionbuilderwidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsextentgroupboxplugin.h
+++ b/src/customwidgets/qgsextentgroupboxplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsexternalresourcewidgetplugin.h
+++ b/src/customwidgets/qgsexternalresourcewidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsfieldcomboboxplugin.h
+++ b/src/customwidgets/qgsfieldcomboboxplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsfieldexpressionwidgetplugin.h
+++ b/src/customwidgets/qgsfieldexpressionwidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsfilewidgetplugin.h
+++ b/src/customwidgets/qgsfilewidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsfilterlineeditplugin.h
+++ b/src/customwidgets/qgsfilterlineeditplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsmaplayercomboboxplugin.h
+++ b/src/customwidgets/qgsmaplayercomboboxplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsprojectionselectionwidgetplugin.h
+++ b/src/customwidgets/qgsprojectionselectionwidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsrelationeditorwidgetplugin.h
+++ b/src/customwidgets/qgsrelationeditorwidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsrelationreferencewidgetplugin.h
+++ b/src/customwidgets/qgsrelationreferencewidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsscalerangewidgetplugin.h
+++ b/src/customwidgets/qgsscalerangewidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsscalewidgetplugin.h
+++ b/src/customwidgets/qgsscalewidgetplugin.h
@ -24,6 +24,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif


--- a/src/customwidgets/qgsspinboxplugin.h
+++ b/src/customwidgets/qgsspinboxplugin.h
@ -23,6 +23,7 @@
 #else
 #include <QtUiPlugin/QDesignerCustomWidgetInterface>
 #include <QtUiPlugin/QDesignerExportWidget>
+#include "qgis_customwidgets.h"
 #endif