[fix] fix Qt version

Analyzable-FR · Aug 25, 2023 · 6ab314c · 6ab314c
1 parent e8b8a2d
commit 6ab314c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,7 +33,10 @@ jobs:
             mkdir build
             cd build
             mkdir release
-            cmake ../ -DCMAKE_INSTALL_PREFIX=./release
+            cmake ../ -DCMAKE_INSTALL_PREFIX=./release -DQT_VERSION_MAJOR=5
+            cmake --build .
+            cmake --install .
+            cmake ../ -DCMAKE_INSTALL_PREFIX=./release -DQT_VERSION_MAJOR=6
             cmake --build .
             cmake --install .
         - name: upload_artefact
@@ -62,8 +65,10 @@ jobs:
             mkdir build
             cd build
             mkdir release
-            cmake ../ -DCMAKE_INSTALL_PREFIX="release" -G "NMake Makefiles"
+            cmake ../ -DCMAKE_INSTALL_PREFIX="release" -G "NMake Makefiles" -DQT_VERSION_MAJOR=5
+            cmake --build .
             cmake --install .
+            cmake ../ -DCMAKE_INSTALL_PREFIX="release" -G "NMake Makefiles" -DQT_VERSION_MAJOR=6
             cmake --build .
             cmake --install .
         - name: upload_artefact
@@ -92,7 +97,10 @@ jobs:
             mkdir build
             cd build
             mkdir release
-            cmake ../ -DCMAKE_INSTALL_PREFIX="release" -G "MinGW Makefiles"
+            cmake ../ -DCMAKE_INSTALL_PREFIX="release" -G "MinGW Makefiles" -DQT_VERSION_MAJOR=5
+            cmake --build .
+            cmake --install .
+            cmake ../ -DCMAKE_INSTALL_PREFIX="release" -G "MinGW Makefiles" -DQT_VERSION_MAJOR=6
             cmake --build .
             cmake --install .
         - name: upload_artefact
@@ -131,7 +139,10 @@ jobs:
               mkdir build
               cd build
               mkdir release
-              cmake ../ -DCMAKE_INSTALL_PREFIX=./release
+              cmake ../ -DCMAKE_INSTALL_PREFIX=./release -DQT_VERSION_MAJOR=5
+              cmake --build .
+              cmake --install .
+              cmake ../ -DCMAKE_INSTALL_PREFIX=./release -DQT_VERSION_MAJOR=6
               cmake --build .
               cmake --install .
         - name: upload_artefact

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(jotform VERSION 0.1 LANGUAGES CXX)
+project(Qt${QT_VERSION_MAJOR}jotform VERSION 0.1 LANGUAGES CXX)
 
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
@@ -9,16 +9,17 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network REQUIRED)
 
-add_library(jotform SHARED
+message(${QT_VERSION_MAJOR})
+
+add_library(${PROJECT_NAME} SHARED
     jotform.h
     jotform.cpp
 )
-target_link_libraries(jotform PRIVATE Qt${QT_VERSION_MAJOR}::Core)
-target_link_libraries(jotform PRIVATE Qt${QT_VERSION_MAJOR}::Network)
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Core)
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Network)
 
 add_executable(test
     main.cpp
@@ -51,7 +52,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
 set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${public_headers}")
 
 include(GNUInstallDirs)
-install(TARGETS jotform
+install(TARGETS ${PROJECT_NAME}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

diff --git a/README.md b/README.md
@@ -5,15 +5,14 @@ A C++/Qt Client library for the [JotForm API](http://api.jotform.com/docs/).
 ## Installation
 
 This library requires Qt6 and/or Qt5 to be installed.
-Modify the `find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network)` line to match your project to compile the shared library for Qt5, Qt6, or both.
 
 ### Unix-style
 
 ```bash
 cd jotform-qt-api
 mkdir build
 cd build
-cmake ../
+cmake ../ -DQT_VERSION_MAJOR=6
 cmake --build .
 cmake --install .
 ```