installer/CMakeLists.txt

@@ -21,9 +21,15 @@ else()
     set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 endif()
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets LinguistTools)
+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets LinguistTools)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools)
 
+if(${QT_VERSION_MAJOR} LESS 6)
+    message("Error: Qt6 or greater required")
+    return()
+endif()
+
+
 set(TS_FILES
     translations/LogDoctorInstaller_en.ts
     translations/LogDoctorInstaller_es.ts
@@ -48,46 +54,28 @@ set(PROJECT_SOURCES
     ${TS_FILES}
 )
 
-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
-    qt_add_executable(LogDoctorInstaller
-        MANUAL_FINALIZATION
-        ${PROJECT_SOURCES}
-    )
-# Define target properties for Android with Qt 6 as:
-#    set_property(TARGET LogDoctorInstaller APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
-#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
-# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
-
-    qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
-else()
-    if(ANDROID)
-        add_library(LogDoctorInstaller SHARED
-            ${PROJECT_SOURCES}
-        )
-# Define properties for Android with Qt 5 after find_package() calls as:
-#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
-    else()
-        add_executable(LogDoctorInstaller
-            ${PROJECT_SOURCES}
-        )
-    endif()
-
-    qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
-endif()
+qt_add_executable(LogDoctorInstaller
+    MANUAL_FINALIZATION
+    ${PROJECT_SOURCES}
+)
+qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
 
 if(WIN32)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic -lgcc -lstdc++ -lwinpthread")
+    target_link_libraries(LogDoctorInstaller PRIVATE
+        -static Qt${QT_VERSION_MAJOR}::Widgets
+    )
+else()
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
+    target_link_libraries(LogDoctorInstaller PRIVATE
+        Qt${QT_VERSION_MAJOR}::Widgets
+    )
 endif()
 
-target_link_libraries(LogDoctorInstaller PRIVATE
-    Qt${QT_VERSION_MAJOR}::Widgets
-)
 
 if(WIN32)
     set_target_properties(LogDoctorInstaller PROPERTIES
         WIN32_EXECUTABLE TRUE)
 endif()
 
-if(QT_VERSION_MAJOR EQUAL 6)
-    qt_finalize_executable(LogDoctorInstaller)
-endif()
+qt_finalize_executable(LogDoctorInstaller)