(cmake) Update qt macro usage (#44)

educelab · Dec 21, 2023 · be77dc0 · be77dc0
1 parent d27f57a
commit be77dc0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ explicitly support other platforms.
 * Eigen3 3.2+
 * spdlog 1.4.2+
 * Boost Program Options 1.58+: Required if building applications or utilities.
-* Qt 6.3+: Required if building GUI applications or utilities.
+* Qt 6.5+: Required if building GUI applications or utilities.
 
 **Optional**
 * Boost Filesystem 1.58+
@@ -177,7 +177,7 @@ cmake -S . -B build/ -DCMAKE_PREFIX_PATH=/opt/homebrew/opt/qt/lib/cmake/
 cmake -S . -B build/ -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake/
 
 # Ubuntu, Qt6 installed from source
-cmake -S . -B build/ -DCMAKE_PREFIX_PATH=/usr/local/Qt-6.4.2/lib/cmake/
+cmake -S . -B build/ -DCMAKE_PREFIX_PATH=/usr/local/Qt-6.5.0/lib/cmake/
 ```
 
 #### Unit tests

diff --git a/apps/Canny/CMakeLists.txt b/apps/Canny/CMakeLists.txt
@@ -77,7 +77,7 @@ if (${VC_INSTALL_APPS})
 
     qt_generate_deploy_app_script(
         TARGET ${target}
-        FILENAME_VARIABLE canny_gui_deploy_script
+        OUTPUT_SCRIPT canny_gui_deploy_script
         NO_UNSUPPORTED_PLATFORM_ERROR
     )
     install(SCRIPT ${canny_gui_deploy_script} COMPONENT Programs)

diff --git a/apps/Projection/CMakeLists.txt b/apps/Projection/CMakeLists.txt
@@ -82,7 +82,7 @@ if (${VC_INSTALL_APPS})
 
     qt_generate_deploy_app_script(
         TARGET ${target}
-        FILENAME_VARIABLE projection_gui_deploy_script
+        OUTPUT_SCRIPT projection_gui_deploy_script
         NO_UNSUPPORTED_PLATFORM_ERROR
     )
     install(SCRIPT ${projection_gui_deploy_script} COMPONENT Programs)

diff --git a/apps/VC/CMakeLists.txt b/apps/VC/CMakeLists.txt
@@ -74,7 +74,7 @@ if (${VC_INSTALL_APPS})
 
     qt_generate_deploy_app_script(
         TARGET ${target}
-        FILENAME_VARIABLE vc_gui_deploy_script
+        OUTPUT_SCRIPT vc_gui_deploy_script
         NO_UNSUPPORTED_PLATFORM_ERROR
     )
     install(SCRIPT ${vc_gui_deploy_script} COMPONENT Programs)

diff --git a/cmake/VCFindDependencies.cmake b/cmake/VCFindDependencies.cmake
@@ -28,7 +28,7 @@ list(APPEND VC_CUSTOM_MODULES "${CMAKE_MODULE_PATH}/FindFilesystem.cmake")
 
 ### Qt6 ###
 if((VC_BUILD_APPS OR VC_BUILD_UTILS) AND VC_BUILD_GUI)
-    find_package(Qt6 6.3 QUIET REQUIRED COMPONENTS Widgets Gui Core Network)
+    find_package(Qt6 6.5 QUIET REQUIRED COMPONENTS Widgets Gui Core Network)
     qt_standard_project_setup()
 endif()