Skip to content

GitLab

Commit 64fcd3d7 authored by Jan Möbius's avatar Jan Möbius
Browse files

- Pass target lib includes through cmakes property system 

- Rename all ui_*.hh includes to ui_*.h
parent d8b0aa12
Hide whitespace changes
Inline Side-by-side
cmake/type.cmake
View file @ 64fcd3d7
......@@ -64,6 +64,12 @@ acg_drop_templates (sources)
acg_add_library ( ${TYPENAME} SHARED ${ui} ${sources} ${headers})
set_target_properties ( ${TYPENAME} PROPERTIES MACOSX_RPATH 0 )
# Allow targets depending on ACG find the autogenerated header files
target_include_directories( ${TYPENAME} PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/${TYPENAME}_autogen/include )
add_dependencies( ${TYPENAME} OpenMeshCore OpenMeshTools ACG OpenFlipperPluginLib)
......
libs_required/ACG/CMakeLists.txt
View file @ 64fcd3d7
......@@ -137,6 +137,10 @@ acg_print_configure_header (ACG "ACG")
RECURSE_GROUPS( ${CMAKE_CURRENT_SOURCE_DIR} )
# Allow targets depending on ACG find the autogenerated header files
target_include_directories( ACG PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/ACG_autogen/include )
target_link_libraries ( ACG ${OPENMESH_LIBRARIES}
${QT_LIBRARIES}
${OPENGL_LIBRARIES}
......
libs_required/ACG/QtWidgets/QtClippingDialog.hh
View file @ 64fcd3d7
......@@ -63,7 +63,7 @@
//== INCLUDES =================================================================
#include "ui_QtClippingDialogUi.hh"
#include "ui_QtClippingDialogUi.h"
#include "../Config/ACGDefines.hh"
#include <QDialog>
......
libs_required/ACG/QtWidgets/QtCoordFrameDialog.hh
View file @ 64fcd3d7
......@@ -63,7 +63,7 @@
//== INCLUDES =================================================================
#include "ui_QtCoordFrameDialogUi.hh"
#include "ui_QtCoordFrameDialogUi.h"
#include "../Math/VectorT.hh"
#include <vector>
......
libs_required/ACG/QtWidgets/QtMaterialDialog.cc
View file @ 64fcd3d7
......@@ -39,15 +39,6 @@
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
......@@ -58,10 +49,13 @@
//== INCLUDES =================================================================
#include "QtMaterialDialog.hh"
#include "../Scenegraph/MaterialNode.hh"
//== NAMESPACES ==============================================================
......
libs_required/ACG/QtWidgets/QtMaterialDialog.hh
View file @ 64fcd3d7
......@@ -39,16 +39,6 @@
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS QtMaterialDialog
......@@ -56,14 +46,13 @@
//=============================================================================
#ifndef ACG_QTMATERIALDIALOG_HH
#define ACG_QTMATERIALDIALOG_HH
#pragma once
//== INCLUDES =================================================================
#include "ui_QtMaterialDialogUi.hh"
#include "ui_QtMaterialDialogUi.h"
#include "../Math/VectorT.hh"
#include "../GL/gl.hh"
......@@ -199,6 +188,4 @@ private:
} // namespace QtWidgets
} // namespace ACG
//=============================================================================
#endif // ACG_QTMATERIALDIALOG_HH defined
//=============================================================================
libs_required/ACG/QtWidgets/QtPrincipalAxisDialog.hh
View file @ 64fcd3d7
......@@ -54,7 +54,7 @@
// qmake users have to include
#include "ui_QtPrincipalAxisDialogBaseUi.hh"
#include "ui_QtPrincipalAxisDialogBaseUi.h"
// ACGMake users have to include
// #include "QtPrincipalAxisDialogBaseUi.hh"
......
libs_required/ACG/QtWidgets/QtSceneGraphWidget.cc
View file @ 64fcd3d7
......@@ -39,16 +39,6 @@
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Author$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS QtSceneGraphWidget - IMPLEMENTATION
......@@ -71,6 +61,8 @@
#include "../Scenegraph/ShaderNode.hh"
#include "../Scenegraph/CoordFrameNode.hh"
#include "ui_QtMaterialDialogUi.h"
#include <stdint.h>
......
libs_required/ACG/QtWidgets/QtShaderDialog.hh
View file @ 64fcd3d7
......@@ -63,7 +63,7 @@
//== INCLUDES =================================================================
#include "ui_QtShaderDialogUi.hh"
#include "ui_QtShaderDialogUi.h"
#include "../Config/ACGDefines.hh"
#include <QColor>
......
libs_required/ACG/QtWidgets/QtTextureDialog.hh
View file @ 64fcd3d7
......@@ -63,7 +63,7 @@
//== INCLUDES =================================================================
#include "ui_QtTextureDialogUi.hh"
#include "ui_QtTextureDialogUi.h"
#include "../Math/VectorT.hh"
#include "../GL/gl.hh"
......
widgets/PluginDialog/PluginDialog.cc
View file @ 64fcd3d7
......@@ -45,6 +45,9 @@
#include "PluginDialog.hh"
#include <QMessageBox>
#include <QMenu>
const QColor PluginDialog::blockColor_ = QColor(228, 155, 18);
const QColor PluginDialog::unloadColor_ = QColor(172, 172, 172);
const QColor PluginDialog::loadedBuiltInColor_ = QColor(208, 240, 192);
......
widgets/PluginDialog/PluginDialog.hh
View file @ 64fcd3d7
......@@ -41,10 +41,8 @@
#include "ui_pluginDialog.hh"
#include "ui_pluginDialog.h"
#include <QtWidgets>
#include <OpenFlipper/Core/PluginInfo.hh>
class PluginDialog : public QDialog, public Ui::PluginDialog
......
widgets/aboutWidget/aboutWidget.cc
View file @ 64fcd3d7
......@@ -47,6 +47,8 @@
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QKeyEvent>
AboutWidget::AboutWidget(QWidget *parent )
: QMainWindow(parent)
{
......
widgets/aboutWidget/aboutWidget.hh
View file @ 64fcd3d7
......@@ -43,10 +43,7 @@
#pragma once
#include "ui_aboutWidget.hh"
#include <QtWidgets>
#include "ui_aboutWidget.h"
class AboutWidget : public QMainWindow, public Ui::AboutWidget
......
widgets/addEmptyWidget/addEmptyWidget.hh
View file @ 64fcd3d7
......@@ -39,19 +39,11 @@
* *
\*===========================================================================*/
#ifndef ADDEMPTYWIDGET_HH
#define ADDEMPTYWIDGET_HH
#pragma once
#include <OpenFlipper/common/Types.hh>
#include "ui_addEmpty.hh"
#include <QtWidgets>
#include "ui_addEmpty.h"
class addEmptyWidget : public QDialog, public Ui::addEmpty
{
......@@ -69,4 +61,3 @@ class addEmptyWidget : public QDialog, public Ui::addEmpty
void slotAddEmpty();
};
#endif
widgets/helpWidget/helpWidget.hh
View file @ 64fcd3d7
......@@ -41,20 +41,10 @@
/*
* helpWidget.hh
*
* Created on: Apr 7, 2009
* Author: kremer
*/
#ifndef HELPWIDGET_HH_
#define HELPWIDGET_HH_
#include "ui_helpWidget.hh"
#include <QtWidgets>
#include "ui_helpWidget.h"
#include <QtHelp>
#include <QTextDocument>
......
widgets/optionsWidget/downloader.cc
View file @ 64fcd3d7
......@@ -47,6 +47,7 @@
#include "optionsWidget.hh"
#include <iostream>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QMessageBox>
void OptionsWidget::startDownload( QString _url ) {
QUrl url(_url);
......
widgets/optionsWidget/keyBindings.cc
View file @ 64fcd3d7
......@@ -44,6 +44,7 @@
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include "optionsWidget.hh"
#include <QMessageBox>
/// get the pluginInfo object corresponding to the given pluginName
int OptionsWidget::getPluginInfo(QString pluginName){
......
widgets/optionsWidget/optionsWidget.cc
View file @ 64fcd3d7
......@@ -50,6 +50,9 @@
#include <ACG/GL/ShaderCache.hh>
#include "optionsWidget.hh"
#include <QColorDialog>
#include <QOpenGLContext>
#include <QMessageBox>
OptionsWidget::OptionsWidget(std::vector<PluginInfo>& _plugins, std::vector<KeyBinding>& _core, InverseKeyMap& _invKeys, QWidget *parent)
: QWidget(parent),
......
widgets/optionsWidget/optionsWidget.hh
View file @ 64fcd3d7
......@@ -50,9 +50,7 @@
#include <OpenFlipper/Core/PluginInfo.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include "ui_optionsWidget.hh"
#include <QtWidgets>
#include "ui_optionsWidget.h"
#include <QStringList>
#include <QProgressDialog>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment