philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix building user apps out of repo

Browse Source 
Our example was being built as part of KDDW, so that worked fine.
Now it can also be built with an installed KDDW.

Problem was the folder hiearchy in the installed include dir
didn't match the folder hiearchy in the source repo

Fixes #62
This commit is contained in:
Sergio Martins
2020-08-14 17:49:24 +01:00
parent caa2ece751
commit 037fa76fff
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/dockwidgets/MyFrameworkWidgetFactory.cpp
View File

@@ -10,9 +10,11 @@
*/
#include "MyFrameworkWidgetFactory.h"
#include <kddockwidgets/FrameworkWidgetFactory.h>
#include <kddockwidgets/private/widgets/TitleBarWidget_p.h>
#include <kddockwidgets/multisplitter/Separator_qwidget.h>
#include <kddockwidgets/private/multisplitter/Separator_qwidget.h>
#include <QApplication>
class MyTitleBar : public KDDockWidgets::TitleBarWidget

12
src/CMakeLists.txt
View File

@@ -194,12 +194,12 @@ if(MSVC AND NOT ${PROJECT_NAME}_STATIC)
endif()
install(FILES ${DOCKS_INSTALLABLE_INCLUDES} DESTINATION include/kddockwidgets)
install(FILES ${DOCKS_INSTALLABLE_PRIVATE_INCLUDES} DESTINATION include/kddockwidgets/private)
install(FILES private/multisplitter/Item_p.h DESTINATION include/kddockwidgets/multisplitter)
install(FILES private/multisplitter/Widget.h DESTINATION include/kddockwidgets/multisplitter)
install(FILES private/multisplitter/Widget_qwidget.h DESTINATION include/kddockwidgets/multisplitter)
install(FILES private/multisplitter/Separator_p.h DESTINATION include/kddockwidgets/multisplitter)
install(FILES private/multisplitter/Separator_qwidget.h DESTINATION include/kddockwidgets/multisplitter)
install(FILES private/multisplitter/multisplitter_export.h DESTINATION include/kddockwidgets/multisplitter)
install(FILES private/multisplitter/Item_p.h DESTINATION include/kddockwidgets/private/multisplitter)
install(FILES private/multisplitter/Widget.h DESTINATION include/kddockwidgets/private/multisplitter)
install(FILES private/multisplitter/Widget_qwidget.h DESTINATION include/kddockwidgets/private/multisplitter)
install(FILES private/multisplitter/Separator_p.h DESTINATION include/kddockwidgets/private/multisplitter)
install(FILES private/multisplitter/Separator_qwidget.h DESTINATION include/kddockwidgets/private/multisplitter)
install(FILES private/multisplitter/multisplitter_export.h DESTINATION include/kddockwidgets/private/multisplitter)
install(FILES ${DOCKS_INSTALLABLE_PRIVATE_WIDGET_INCLUDES} DESTINATION include/kddockwidgets/private/widgets)
include(CMakePackageConfigHelpers)

4
src/QWidgetAdapter.h
View File

@@ -41,7 +41,7 @@ inline bool isMinimized(QWindow *window)
}}
#ifdef KDDOCKWIDGETS_QTWIDGETS
# include "../multisplitter/Widget_qwidget.h"
# include "private/multisplitter/Widget_qwidget.h"
# include "private/widgets/QWidgetAdapter_widgets_p.h"
# include <QMainWindow>
namespace KDDockWidgets {
@@ -55,7 +55,7 @@ inline bool isMinimized(QWindow *window)
typedef QWidget WidgetType;
}
#else
# include "../multisplitter/Widget_quick.h"
# include "private/multisplitter/Widget_quick.h"
# include "private/quick/QWidgetAdapter_quick_p.h"
namespace KDDockWidgets {
class MainWindowQuick;

2
src/fwd_headers/kddockwidgets/multisplitter/Separator_qwidget.h → src/fwd_headers/kddockwidgets/private/multisplitter/Separator_qwidget.h
View File

@@ -9,4 +9,4 @@
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/
#include "../../../private/multisplitter/Separator_qwidget.h"
#include "../../../../private/multisplitter/Separator_qwidget.h"

2
src/fwd_headers/kddockwidgets/multisplitter/Widget_qwidget.h → src/fwd_headers/kddockwidgets/private/multisplitter/Widget_qwidget.h
View File

@@ -9,4 +9,4 @@
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/
#include "../../../private/multisplitter/Widget_qwidget.h"
#include "../../../../private/multisplitter/Widget_qwidget.h"