Generate at build time alias headers

sithlord48 · Aug 29, 2022 · 0e91936 · 0e91936
1 parent 445be69
commit 0e91936
Show file tree

Hide file tree

Showing 110 changed files with 195 additions and 178 deletions.
diff --git a/demos/ff7tkQmlGallery/main.cpp b/demos/ff7tkQmlGallery/main.cpp
@@ -18,9 +18,9 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 
-#include <FF7Text.h>
-#include <FF7Item.h>
-#include <ff7tkAbout.h>
+#include <FF7Text>
+#include <FF7Item>
+#include <ff7tkAbout>
 
 int main(int argc, char *argv[])
 {

diff --git a/demos/ff7tkWidgetGallery/mainwindow.cpp b/demos/ff7tkWidgetGallery/mainwindow.cpp
@@ -23,9 +23,9 @@
 #include <QMessageBox>
 #include <QProgressDialog>
 
-#include <FF7Save.h>
-#include <ff7tkAbout.h>
-#include <FF7ItemModel.h>
+#include <FF7Save>
+#include <ff7tkAbout>
+#include <FF7ItemModel>
 
 MainWindow::MainWindow(QWidget *parent): QMainWindow(parent), ui(new Ui::MainWindow)
 {

diff --git a/demos/ff7tkWidgetGallery/mainwindow.h b/demos/ff7tkWidgetGallery/mainwindow.h
@@ -30,7 +30,7 @@
 #include <AchievementEditor.h>
 #include <ItemListView.h>
 #include <HexLineEdit.h>
-#include <Lgp.h>
+#include <Lgp>
 
 namespace Ui
 {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -20,14 +20,30 @@ endif()
 # LIB_TARGET_PrivateLIBLINKS
 macro(MAKE_LIBRARY LIB_TARGET HEADER_INSTALL_DIR)
 
-    add_library (${LIB_TARGET}
-        SHARED
+    add_library (${LIB_TARGET} SHARED
             ${${LIB_TARGET}_SRC}
             ${${LIB_TARGET}_HEADERS}
             ${${LIB_TARGET}_RESOURCES}
     )
     add_library (ff7tk::${LIB_TARGET} ALIAS ${LIB_TARGET})
 
+    #Generate the non .h ending header let the user include "HEADER" or "HEADER.h"
+    foreach ( HEADER ${${LIB_TARGET}_HEADERS})
+        if(${HEADER} MATCHES "^/")
+            string(FIND ${HEADER} "/" lastSlash REVERSE)
+            string(SUBSTRING ${HEADER} 0 ${lastSlash} RMSTRING)
+            string(REPLACE "${RMSTRING}/" "" HEADER ${HEADER})
+        elseif(${HEADER} MATCHES "^([A-Z]):")
+            string(FIND ${HEADER} "/" lastSlash REVERSE)
+            string(SUBSTRING ${HEADER} 0 ${lastSlash} RMSTRING)
+            string(REPLACE "${RMSTRING}/" "" HEADER ${HEADER})
+        endif()
+        set(fileContent "#pragma once\n#include<${HEADER}>\n")
+        string(REPLACE ".h" "" HEADER ${HEADER})
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${HEADER} ${fileContent})
+        list(APPEND ALIASHEADERS ${CMAKE_CURRENT_BINARY_DIR}/${HEADER})
+    endforeach()
+
     if(APPLE)
         set_target_properties(${LIB_TARGET} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
         if(${BUILD_FRAMEWORKS})
@@ -86,6 +102,10 @@ macro(MAKE_LIBRARY LIB_TARGET HEADER_INSTALL_DIR)
         PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_INSTALL_DIR}
             COMPONENT ff7tk_headers
     )
+    install (FILES ${ALIASHEADERS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_INSTALL_DIR}
+        COMPONENT ff7tk_headers
+    )
 
     if(UNIX)
         if(NOT APPLE)

diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
@@ -22,8 +22,8 @@ set (ff7tk_HEADERS
     FF7Achievements.h  FF7Item.h           FF7Save.h      FF7Text.h        Type_FF7CHOCOBO.h
     FF7Char.h          FF7Location.h       FF7SaveInfo.h  SaveIcon.h       Type_materia.h
     FF7ItemModel.h
-    ${CMAKE_CURRENT_BINARY_DIR}/ff7tk_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/ff7tkAbout.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ff7tk_export.h
 )
 
 set ( ff7tk_RESOURCES

diff --git a/src/data/FF7Achievements.cpp b/src/data/FF7Achievements.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Achievements.h>
+#include <FF7Achievements>
 
 #include <QFile>
 

diff --git a/src/data/FF7Achievements.h b/src/data/FF7Achievements.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 /*!
  * \class FF7Achievements

diff --git a/src/data/FF7Char.cpp b/src/data/FF7Char.cpp
@@ -14,7 +14,7 @@
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
 
-#include <FF7Char.h>
+#include <FF7Char>
 
 #include <QIcon>
 #include <QRandomGenerator>

diff --git a/src/data/FF7Char.h b/src/data/FF7Char.h
@@ -17,8 +17,8 @@
 
 #include <QObject>
 #include <QtGlobal>
-#include <ff7tk_export.h>
-#include <Type_FF7CHAR.h>
+#include <ff7tk_export>
+#include <Type_FF7CHAR>
 
 class QIcon;
 class QQmlEngine;

diff --git a/src/data/FF7FieldItemList.cpp b/src/data/FF7FieldItemList.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7FieldItemList.h>
+#include <FF7FieldItemList>
 
 #include<QStringList>
 #include <QQmlEngine>

diff --git a/src/data/FF7FieldItemList.h b/src/data/FF7FieldItemList.h
@@ -17,7 +17,7 @@
 
 #include <QObject>
 #include <QtGlobal>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 class QQmlEngine;
 class QJSEngine;

diff --git a/src/data/FF7Item.cpp b/src/data/FF7Item.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Item.h>
+#include <FF7Item>
 
 #include <QIcon>
 #include <QtEndian>

diff --git a/src/data/FF7Item.h b/src/data/FF7Item.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 class QIcon;
 class QQmlEngine;

diff --git a/src/data/FF7ItemModel.cpp b/src/data/FF7ItemModel.cpp
@@ -1,5 +1,5 @@
-#include "FF7ItemModel.h"
-#include <FF7Item.h>
+#include <FF7ItemModel>
+#include <FF7Item>
 #include <QIcon>
 #include <QModelIndex>
 

diff --git a/src/data/FF7ItemModel.h b/src/data/FF7ItemModel.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QAbstractTableModel>
-#include <ff7tk_export.h>
-#include <FF7Item.h>
+#include <ff7tk_export>
+#include <FF7Item>
 
 class FF7TK_EXPORT FF7ItemModel : public QAbstractTableModel
 {

diff --git a/src/data/FF7Location.cpp b/src/data/FF7Location.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Location.h>
+#include <FF7Location>
 
 #include <QQmlEngine>
 

diff --git a/src/data/FF7Location.h b/src/data/FF7Location.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 class QQmlEngine;
 class QJSEngine;

diff --git a/src/data/FF7Materia.cpp b/src/data/FF7Materia.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Materia.h>
+#include <FF7Materia>
 
 #include <QQmlEngine>
 

diff --git a/src/data/FF7Materia.h b/src/data/FF7Materia.h
@@ -19,8 +19,8 @@
 #include <QIcon>
 #include <QtEndian>
 
-#include <ff7tk_export.h>
-#include <Type_materia.h>
+#include <ff7tk_export>
+#include <Type_materia>
 
 class QQmlEngine;
 class QJSEngine;

diff --git a/src/data/FF7Save.cpp b/src/data/FF7Save.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7Save.h>
+#include <FF7Save>
 // This Class should contain NO Gui Parts
 #include <QColor>
 #include <QDateTime>
@@ -26,10 +26,10 @@
 #include <QtXml/QDomDocument>
 #include <QVector>
 #include <QtEndian>
-#include <FF7Text.h>
-#include <FF7Item.h>
-#include <FF7Materia.h>
-#include <FF7Char.h>
+#include <FF7Text>
+#include <FF7Item>
+#include <FF7Materia>
+#include <FF7Char>
 
 // I'm not installing this header.
 #include "crypto/aes.h"

diff --git a/src/data/FF7Save.h b/src/data/FF7Save.h
@@ -17,9 +17,9 @@
 
 #include <QObject>
 #include <cstdlib>
-#include <ff7tk_export.h>
-#include <FF7SaveInfo.h>
-#include <FF7Save_Types.h>
+#include <ff7tk_export>
+#include <FF7SaveInfo>
+#include <FF7Save_Types>
 
 class QColor;
 class QDateTime;

diff --git a/src/data/FF7SaveInfo.cpp b/src/data/FF7SaveInfo.cpp
@@ -13,7 +13,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <FF7SaveInfo.h>
+#include <FF7SaveInfo>
 
 #include <QByteArrayList>
 #include <QQmlEngine>

diff --git a/src/data/FF7SaveInfo.h b/src/data/FF7SaveInfo.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
 #include <QRegularExpression>
+#include <ff7tk_export>
 
 class QJSEngine;
 class QQmlEngine;

diff --git a/src/data/FF7Save_Types.h b/src/data/FF7Save_Types.h
@@ -28,9 +28,9 @@
 #endif
 
 #include <QVector>
-#include <ff7tk_export.h>
-#include <Type_FF7CHAR.h>
-#include <Type_FF7CHOCOBO.h>
+#include <ff7tk_export>
+#include <Type_FF7CHAR>
+#include <Type_FF7CHOCOBO>
 //Materia Type is included as part of FF7Char
 /*~~~~~~~~~~~~~~~~~~~~~~~~STRUCT TYPES AND SAVE STRUCT~~~~~~~~~~~~~~~~*/
 PACK(

diff --git a/src/data/FF7Text.h b/src/data/FF7Text.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QObject>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 class QQmlEngine;
 class QJSEngine;

diff --git a/src/data/SaveIcon.h b/src/data/SaveIcon.h
@@ -18,7 +18,7 @@
 
 #include <QObject>
 #include <QPixmap>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 /** \class SaveIcon
  *  \brief PSX icon data as a QPixmap

diff --git a/src/data/Type_FF7CHAR.h b/src/data/Type_FF7CHAR.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <QtCore/qglobal.h>
-#include <Type_materia.h>
-#include <ff7tk_export.h>
+#include <Type_materia>
+#include <ff7tk_export>
 
 /*! \struct FF7CHAR
  * \brief  Character Info in the save game.

diff --git a/src/data/Type_FF7CHOCOBO.h b/src/data/Type_FF7CHOCOBO.h
@@ -15,7 +15,7 @@
 /****************************************************************************/
 #pragma once
 #include <QtCore/qglobal.h>
-#include <ff7tk_export.h>
+#include <ff7tk_export>
 
 #ifdef _MSC_VER
 #   define PACK(structure)          \

diff --git a/src/formats/Akao.cpp b/src/formats/Akao.cpp
@@ -13,6 +13,6 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <Akao.h>
+#include <Akao>
 
 Akao::Akao() { }
diff --git a/src/formats/Akao.h b/src/formats/Akao.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QtCore>
-#include <ff7tkformats_export.h>
+#include <ff7tkformats_export>
 
 class FF7TKFORMATS_EXPORT Akao
 {

diff --git a/src/formats/AkaoIO.h b/src/formats/AkaoIO.h
@@ -15,8 +15,8 @@
 /****************************************************************************/
 #pragma once
 
-#include <IO.h>
-#include <Akao.h>
+#include <IO>
+#include <Akao>
 
 class AkaoIO : public IO
 {

diff --git a/src/formats/Archive.cpp b/src/formats/Archive.cpp
@@ -14,7 +14,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <Archive.h>
+#include <Archive>
 
 ArchiveObserver::~ArchiveObserver()
 {

diff --git a/src/formats/Archive.h b/src/formats/Archive.h
@@ -20,7 +20,7 @@
 #include <QByteArray>
 #include <QFile>
 #include <QDebug>
-#include <ff7tkformats_export.h>
+#include <ff7tkformats_export>
 
 struct FF7TKFORMATS_EXPORT ArchiveObserver {
     ArchiveObserver() {}

diff --git a/src/formats/IsoArchive.cpp b/src/formats/IsoArchive.cpp
@@ -14,7 +14,7 @@
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
 //    GNU General Public License for more details.                          //
 /****************************************************************************/
-#include <IsoArchive.h>
+#include <IsoArchive>
 #include <QCoreApplication>
 #include <QDir>
 #include <QtEndian>

diff --git a/src/formats/IsoArchive.h b/src/formats/IsoArchive.h
@@ -18,8 +18,8 @@
 
 #include <QIODevice>
 #include <QString>
-#include <Archive.h>
-#include <ff7tkformats_export.h>
+#include <Archive>
+#include <ff7tkformats_export>
 
 #define MAX_ISO_READ            10000
 #define MAX_FILENAME_LENGTH     207