Update OBCMake

oblivioncth · Oct 2, 2024 · 2032e82 · 2032e82
1 parent a849dc7
commit 2032e82
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ project(Qx
 
 # Get helper scripts
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FetchOBCMake.cmake)
-fetch_ob_cmake("4266636139c46dc936baa0f0f621cf2ffaf18292")
+fetch_ob_cmake("v0.3.7")
 
 # Initialize project according to standard rules
 include(OB/Project)
@@ -96,8 +96,8 @@ endif()
 
 # Find Qt package
 add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060000)
-include(OB/BetterFindQt6)
-ob_find_qt6_package(REQUIRED COMPONENTS ${ALL_QT_COMPONENTS})
+include(OB/Qt)
+ob_find_package_qt(REQUIRED COMPONENTS ${ALL_QT_COMPONENTS})
 
 #--------------------Package Config-----------------------
 

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -19,7 +19,7 @@ set(DOXYGEN_PREDEFINED
 ob_standard_documentation(${DOC_TARGET_NAME}
     DOXY_VER 1.9.4
     PROJ_NAME "${PROJECT_NAME}"
-    QT_PREFIX "${Qt6_PREFIX_PATH}"
+    QT_PREFIX "${Qt_PREFIX_PATH}"
     QT_MODULES
         qtconcurrent
         qtcore

diff --git a/lib/core/CMakeLists.txt b/lib/core/CMakeLists.txt
@@ -87,6 +87,6 @@ qx_add_component("Core"
         qx-table.dox
     LINKS
         PUBLIC
-            Qt6::Core
+            ${Qt}::Core
             Qx::Utility
 )
diff --git a/lib/gui/CMakeLists.txt b/lib/gui/CMakeLists.txt
@@ -6,6 +6,6 @@ qx_add_component("Gui"
         qx-color.cpp
     LINKS
         PUBLIC
-            Qt6::Core
-            Qt6::Gui
+            ${Qt}::Core
+            ${Qt}::Gui
 )
diff --git a/lib/linux/CMakeLists.txt b/lib/linux/CMakeLists.txt
@@ -12,7 +12,7 @@ qx_add_component("Linux"
         qx-directorydesktopentry.cpp
     LINKS
         PUBLIC
-            Qt6::Core
+            ${Qt}::Core
             Qx::Core
             Qx::Io
 )
diff --git a/lib/network/CMakeLists.txt b/lib/network/CMakeLists.txt
@@ -14,8 +14,8 @@ qx_add_component("Network"
         qx-downloadtask.cpp
     LINKS
         PUBLIC
-            Qt6::Core
-            Qt6::Network
+            ${Qt}::Core
+            ${Qt}::Network
             Qx::Core
             Qx::Io
 )
diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt
@@ -14,7 +14,7 @@ qx_add_component("Widgets"
         qx-treeinputdialog.cpp
     LINKS
         PUBLIC
-            Qt6::Core
-            Qt6::Widgets
+            ${Qt}::Core
+            ${Qt}::Widgets
             Qx::Core
 )
diff --git a/lib/windows-gui/CMakeLists.txt b/lib/windows-gui/CMakeLists.txt
@@ -13,6 +13,6 @@ qx_add_component("Windows-gui"
             Qx::Windows
             Qx::Core
         PUBLIC
-            Qt6::Core
-            Qt6::Gui
+            ${Qt}::Core
+            ${Qt}::Gui
 )
diff --git a/lib/windows/CMakeLists.txt b/lib/windows/CMakeLists.txt
@@ -13,7 +13,7 @@ qx_add_component("Windows"
         PRIVATE
             Qx::Io
         PUBLIC
-            Qt6::Core
+            ${Qt}::Core
             Version.lib
             Qx::Core
 )
diff --git a/lib/xml/CMakeLists.txt b/lib/xml/CMakeLists.txt
@@ -10,6 +10,6 @@ qx_add_component("Xml"
         qx-xmlstreamwritererror.cpp
     LINKS
         PUBLIC
-            Qt6::Core
-            Qt6::Xml
+            ${Qt}::Core
+            ${Qt}::Xml
 )
diff --git a/tests/_common/CMakeLists.txt b/tests/_common/CMakeLists.txt
@@ -15,5 +15,5 @@ target_include_directories(${TESTS_COMMON_TARGET}
 
 target_link_libraries(${TESTS_COMMON_TARGET}
     INTERFACE
-        Qt6::Test
+        ${Qt}::Test
 )