Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 0d135d43 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

MISC: Add a way to use .hh files with cmake

CMP0100 is set to NEW, so moc and uic can be run on .hh files if needed.
This is the new behaviour of the policy so it's safe. It also permits to
separate clearly C++ headers from C ones.
parent 9746017c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!3Add documents
Affichage de
avec 40 ajouts et 28 suppressions
......@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.5)
project(Vivy VERSION 0.1)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
cmake_policy(SET CMP0100 NEW) # Let cmake use moc and uic for .hh files
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
......@@ -35,8 +36,11 @@ file(GLOB Vivy_SRC
)
file(GLOB Vivy_INC
"${CMAKE_CURRENT_SOURCE_DIR}/src/*.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.hh"
)
set(PROJECT_SOURCES
${Vivy_SRC}
......
#ifndef VIVY_ASS_ASS_H
#define VIVY_ASS_ASS_H
#include "Char.h"
#include "Line.h"
#include "Syl.h"
#include "Style.h"
#include "Char.hh"
#include "Line.hh"
#include "Syl.hh"
#include "Style.hh"
#endif // VIVY_ASS_ASS_H
#include "Char.h"
#include "Syl.h"
#include "Char.hh"
#include "Syl.hh"
Char::Char(Syl *const syl, const QChar /*unused*/)
: parentLine(syl->parentLine)
......
#ifndef VIVY_ASS_CHAR_H
#define VIVY_ASS_CHAR_H
#include "Style.h"
#include <QChar>
#include <QtGlobal>
......
#include "Line.h"
#include "Line.hh"
Line::Line(const QString & /*unused*/)
{
......
......@@ -3,8 +3,7 @@
#include <QString>
#include <QtGlobal>
#include "Style.h"
#include "Syl.h"
#include "Syl.hh"
class Line {
private:
......
#include "Style.h"
#include "Style.hh"
Style::Style(const QString & /*unused*/)
{
......
Fichier déplacé
#include "Syl.h"
#include "Syl.hh"
Syl::Syl(Line *const line, const QString & /*unused*/)
: parentLine(line)
......
#ifndef VIVY_SYL_H
#define VIVY_SYL_H
#include "Char.h"
#include "Style.h"
#include <cstdint>
#include "Char.hh"
#include <QString>
#include <QVector>
#include <QtGlobal>
class Line;
......
#include "AudioVisualizer.h"
#include "AudioVisualizer.hh"
#include "AudioUtils.h"
#include <QGraphicsPixmapItem>
......
......@@ -5,7 +5,7 @@
#error "This is a C++ header"
#endif
#include "TimingView.hpp"
#include "TimingView.hh"
#include <QWidget>
#include <QString>
......
#include "DialogHelp.h"
#include "VivyApplication.h"
#include "DialogHelp.hh"
#include "VivyApplication.hh"
#include <QWidget>
#include <QLabel>
......
Fichier déplacé
......@@ -5,8 +5,8 @@
#error "This is a C++ header"
#endif
#include "../Utils.h"
#include "../Ass/Ass.h"
#include "../Utils.hh"
#include "../Ass/Ass.hh"
#include <QString>
#include <memory>
......
#include "VivyDocument.h"
#include "../Utils.h"
#include "VivyDocument.hh"
#include "../Utils.hh"
#include <QFileInfo>
#include <QString>
......
......@@ -5,8 +5,8 @@
#error "This is a C++ header"
#endif
#include "../Utils.h"
#include "CRTPDocument.h"
#include "../Utils.hh"
#include "CRTPDocument.hh"
#include <memory>
#include <QString>
......
#include "VivyDocumentStore.h"
#include "VivyDocument.h"
#include "VivyDocumentStore.hh"
#include "VivyDocument.hh"
VivyDocumentStore::~VivyDocumentStore() noexcept
{
......
#ifndef VIVY_DOCUMENTSTORE_H
#define VIVY_DOCUMENTSTORE_H
#include "VivyDocument.h"
#include "VivyDocumentView.h"
#include "VivyDocument.hh"
#include "VivyDocumentView.hh"
#include <QMap>
#include <QString>
......
#include "VivyDocumentView.h"
#include "../AudioVisualizer.h"
#include "VivyDocument.h"
#include "VivyDocumentView.hh"
#include "../AudioVisualizer.hh"
#include "VivyDocument.hh"
#include <QVBoxLayout>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter