From 6795531f2a7d928295f5f86581d114550a73eb5c Mon Sep 17 00:00:00 2001 From: jw098 Date: Thu, 14 Nov 2024 17:04:44 -0800 Subject: [PATCH 1/2] check QT version --- SerialPrograms/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 4dc12c9ca..0812c3d8e 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -2273,4 +2273,6 @@ file(GLOB MY_DLLS file(COPY ${MY_DLLS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) endif() -qt_finalize_target(SerialPrograms) +if (QT_MAJOR EQUAL 6) + qt_finalize_target(SerialPrograms) +endif() From 0224043532e6cd33f627a9a716dd1dca09f21f99 Mon Sep 17 00:00:00 2001 From: jw098 Date: Thu, 14 Nov 2024 17:27:12 -0800 Subject: [PATCH 2/2] minor change --- SerialPrograms/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 0812c3d8e..c0bd144ef 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -2273,6 +2273,6 @@ file(GLOB MY_DLLS file(COPY ${MY_DLLS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) endif() -if (QT_MAJOR EQUAL 6) +if (QT_MAJOR GREATER_EQUAL 6) qt_finalize_target(SerialPrograms) endif()