Additional Replacement for generic

sithlord48 · Dec 5, 2023 · 73ee04c · 73ee04c
1 parent a8025bd
commit 73ee04c
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 46 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -156,10 +156,10 @@ sbom_finalize(
     ${NO_VERIFY}
     ${GRPAH}
 )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sbom-${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}.spdx DESTINATION share/ff7tk COMPONENT ${CMAKE_PROJECT_NAME}_libraries)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sbom-${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}.spdx DESTINATION share/${CMAKE_PROJECT_NAME} COMPONENT ${CMAKE_PROJECT_NAME}_libraries)
 
 if(SBOM_GRAPH)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sbom-${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-spdx.png DESTINATION share/ff7tk COMPONENT ${CMAKE_PROJECT_NAME}_libraries)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sbom-${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-spdx.png DESTINATION share/${CMAKE_PROJECT_NAME} COMPONENT ${CMAKE_PROJECT_NAME}_libraries)
 endif()
 
 option(REUSE_LINT "Verify project for reuse complance" OFF)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -35,12 +35,12 @@ endif()
 
 install(
     EXPORT
-        ff7tkTargets
+        ${CMAKE_PROJECT_NAME}Targets
     DESTINATION
-        ${CMAKE_INSTALL_LIBDIR}/cmake/ff7tk
+        ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME}
     FILE
-        ff7tkTargets.cmake
+        ${CMAKE_PROJECT_NAME}Targets.cmake
     NAMESPACE
-        ff7tk::
-    COMPONENT ff7tk_headers
+        ${CMAKE_PROJECT_NAME}::
+    COMPONENT ${CMAKE_PROJECT_NAME}_headers
 )
diff --git a/src/core/ff7tkConfig.cmake.in b/src/core/ff7tkConfig.cmake.in
@@ -7,4 +7,4 @@ find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS
     Core
 )
 
-include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
diff --git a/src/core/ff7tkInfo.h.in b/src/core/ff7tkInfo.h.in
@@ -41,31 +41,31 @@ public:
         QMap<QString, QTranslator *> ff7tk_translations;
         QDir dir;
         static const QString appDir = QCoreApplication::applicationDirPath();
-        static const auto nameFilter = QStringList{QStringLiteral("ff7tk_*.qm")};
+        static const auto nameFilter = QStringList{QStringLiteral("@CMAKE_PROJECT_NAME@_*.qm")};
         static const auto mainFolders = {
             appDir
             , QStringLiteral("%1/../..").arg(appDir)
             , QStringLiteral("%1/..").arg(appDir)
-            , QStringLiteral("%1/../share/ff7tk").arg(appDir)
+            , QStringLiteral("%1/../share/@CMAKE_PROJECT_NAME@").arg(appDir)
 #if defined (Q_OS_UNIX)
-            , QStringLiteral("%1/.local/share/ff7tk").arg(QDir::homePath())
-            , QStringLiteral("/opt/ff7tk-continious/share/ff7tk")
-            , QStringLiteral("/opt/ff7tk-%1/share/ff7tk").arg(m_ff7tk_version)
-            , QStringLiteral("/opt/ff7tk/share/ff7tk")
-            , QStringLiteral("/usr/share/ff7tk")
-            , QStringLiteral("/usr/local/share/ff7tk")
+            , QStringLiteral("%1/.local/share/@CMAKE_PROJECT_NAME@").arg(QDir::homePath())
+            , QStringLiteral("/opt/ff7tk-continious/share/@CMAKE_PROJECT_NAME@")
+            , QStringLiteral("/opt/ff7tk-%1/share/@CMAKE_PROJECT_NAME@").arg(m_ff7tk_version)
+            , QStringLiteral("/opt/ff7tk/share/@CMAKE_PROJECT_NAME@")
+            , QStringLiteral("/usr/share/@CMAKE_PROJECT_NAME@")
+            , QStringLiteral("/usr/local/share/@CMAKE_PROJECT_NAME@")
 # elif defined (Q_OS_WIN)
-            , QStringLiteral("%1Program Files/ff7tk-continious/share/ff7tk").arg(QDir::rootPath())
-            , QStringLiteral("%1Program Files/ff7tk-%2/share/ff7tk").arg(QDir::rootPath(), m_ff7tk_version)
-            , QStringLiteral("%1Program Files/ff7tk/share/ff7tk").arg(QDir::rootPath())
+            , QStringLiteral("%1Program Files/ff7tk-continious/share/@CMAKE_PROJECT_NAME@").arg(QDir::rootPath())
+            , QStringLiteral("%1Program Files/ff7tk-%2/share/@CMAKE_PROJECT_NAME@").arg(QDir::rootPath(), m_ff7tk_version)
+            , QStringLiteral("%1Program Files/ff7tk/share/@CMAKE_PROJECT_NAME@").arg(QDir::rootPath())
 #endif
 #if defined (Q_OS_DARWIN)
-            , QStringLiteral("%1/Applications/ff7tk-continious/share/ff7tk").arg(QDir::homePath())
-            , QStringLiteral("%1/Applications/ff7tk-%2/share/ff7tk").arg(QDir::homePath(), m_ff7tk_version)
-            , QStringLiteral("%1/Applications/ff7tk/share/ff7tk").arg(QDir::homePath())
-            , QStringLiteral("/Applications/ff7tk-continious/share/ff7tk")
-            , QStringLiteral("/Applications/ff7tk-%1/share/ff7tk").arg(m_ff7tk_version)
-            , QStringLiteral("/Applications/ff7tk/share/ff7tk")
+            , QStringLiteral("%1/Applications/ff7tk-continious/share/@CMAKE_PROJECT_NAME@").arg(QDir::homePath())
+            , QStringLiteral("%1/Applications/ff7tk-%2/share/@CMAKE_PROJECT_NAME@").arg(QDir::homePath(), m_ff7tk_version)
+            , QStringLiteral("%1/Applications/ff7tk/share/@CMAKE_PROJECT_NAME@").arg(QDir::homePath())
+            , QStringLiteral("/Applications/ff7tk-continious/share/@CMAKE_PROJECT_NAME@")
+            , QStringLiteral("/Applications/ff7tk-%1/share/@CMAKE_PROJECT_NAME@").arg(m_ff7tk_version)
+            , QStringLiteral("/Applications/ff7tk/share/@CMAKE_PROJECT_NAME@")
 #endif
         };
         static const auto subFolders = {QStringLiteral("translations"), QStringLiteral("i18n"), QStringLiteral("lang")};

diff --git a/src/data/ff7tkDataConfig.cmake.in b/src/data/ff7tkDataConfig.cmake.in
@@ -10,4 +10,4 @@ find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS
     Core5Compat
 )
 
-include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
diff --git a/src/ff7tkQuick/Controls/ff7tkQuickControlsConfig.cmake.in b/src/ff7tkQuick/Controls/ff7tkQuickControlsConfig.cmake.in
@@ -10,4 +10,4 @@ find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS
     QuickControls2
 )
 
-include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
diff --git a/src/ff7tkQuick/DataTypes/ff7tkQuickDataTypesConfig.cmake.in b/src/ff7tkQuick/DataTypes/ff7tkQuickDataTypesConfig.cmake.in
@@ -9,4 +9,4 @@ find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS
     Quick
 )
 
-include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
diff --git a/src/formats/ff7tkFormatsConfig.cmake.in b/src/formats/ff7tkFormatsConfig.cmake.in
@@ -5,4 +5,4 @@
 
 include(CMakeFindDependencyMacro)
 find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS Core)
-include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
diff --git a/src/utils/ff7tkUtilsConfig.cmake.in b/src/utils/ff7tkUtilsConfig.cmake.in
@@ -6,5 +6,5 @@ include(CMakeFindDependencyMacro)
 find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS Core Gui)
 find_dependency(ZLIB)
 
-include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
 
diff --git a/src/widgets/common/ff7tkQtWidgetsConfig.cmake.in b/src/widgets/common/ff7tkQtWidgetsConfig.cmake.in
@@ -8,4 +8,4 @@ find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS
     Gui
     Widgets
 )
-include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
diff --git a/src/widgets/data/ff7tkWidgetsConfig.cmake.in b/src/widgets/data/ff7tkWidgetsConfig.cmake.in
@@ -8,4 +8,4 @@ find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS
     Gui
     Widgets
 )
-include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
@@ -5,15 +5,15 @@ set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM 1)
 option(CLEAN_TRS "Clean Obsolete translations from tr files" FALSE)
 find_package(Qt6LinguistTools)
 
-set(ff7tk_TRS
-    ff7tk_de.ts
-    ff7tk_en.ts
-    ff7tk_es.ts
-    ff7tk_fr.ts
-    ff7tk_it.ts
-    ff7tk_ja.ts
-    ff7tk_re.ts
-    ff7tk_pl.ts
+set(${CMAKE_PROJECT_NAME}_TRS
+    ${CMAKE_PROJECT_NAME}_de.ts
+    ${CMAKE_PROJECT_NAME}_en.ts
+    ${CMAKE_PROJECT_NAME}_es.ts
+    ${CMAKE_PROJECT_NAME}_fr.ts
+    ${CMAKE_PROJECT_NAME}_it.ts
+    ${CMAKE_PROJECT_NAME}_ja.ts
+    ${CMAKE_PROJECT_NAME}_re.ts
+    ${CMAKE_PROJECT_NAME}_pl.ts
 )
 
 if(CLEAN_TRS)
@@ -22,7 +22,7 @@ else()
     set(CLEAN_OPTION "")
 endif()
 
-qt_create_translation(TRS ${CMAKE_SOURCE_DIR}/src ${ff7tk_TRS} OPTIONS -no-ui-lines -locations none ${CLEAN_OPTION})
-add_custom_target(ff7tk_translations ALL DEPENDS ${TRS})
+qt_create_translation(TRS ${CMAKE_SOURCE_DIR}/src ${${CMAKE_PROJECT_NAME}_TRS} OPTIONS -no-ui-lines -locations none ${CLEAN_OPTION})
+add_custom_target(${CMAKE_PROJECT_NAME}_translations ALL DEPENDS ${TRS})
 
-install(FILES ${TRS} DESTINATION ${CMAKE_INSTALL_DATADIR}/ff7tk/translations COMPONENT ${CMAKE_PROJECT_NAME}_i18n)
+install(FILES ${TRS} DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/translations COMPONENT ${CMAKE_PROJECT_NAME}_i18n)
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
@@ -25,9 +25,9 @@ if(UNIX AND NOT APPLE)
     set(qPA_Platform "QT_QPA_PLATFORM=minimal")
 endif()
 
-get_property( FF7TK_TESTS GLOBAL PROPERTY ff7tk_tests)
+get_property( ${CMAKE_PROJECT_NAME}_TESTS GLOBAL PROPERTY ${CMAKE_PROJECT_NAME}_tests)
 
-add_custom_target (run_tests ALL DEPENDS ${FF7TK_TESTS})
+add_custom_target (run_tests ALL DEPENDS ${${CMAKE_PROJECT_NAME}_TESTS})
 
 add_custom_command(
     TARGET run_tests
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS @@
         Core
     )
-    include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")