Update appveyor.yml

coin3d · Sep 7, 2024 · c33f2eb · c33f2eb
1 parent fcce51f
commit c33f2eb
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -29,43 +29,43 @@ environment:
 #      CMAKE_GENERATOR: 'Unix Makefiles'
 #      CMAKE_PLATFORM: x64
 #      COMPILER_ID: clang
-#      QT_ID: Qt5.15
+#      QT_VERSION: 5.15
 
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       COMPILER_ID: clang
-      QT_ID: Qt5.15
+      QT_VERSION: 5.15
 
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       COMPILER_ID: clang
-      QT_ID: Qt6.6
+      QT_VERSION: 6.6
 
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-ventura
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       COMPILER_ID: clang
-      QT_ID: Qt5.15
+      QT_VERSION: 5.15
 
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-ventura
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       COMPILER_ID: clang
-      QT_ID: Qt6.6
+      QT_VERSION: 6.6
 
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       COMPILER_ID: clang
-      QT_ID: Qt5.15
+      QT_VERSION: 5.15
 
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       COMPILER_ID: clang
-      QT_ID: Qt6.6
+      QT_VERSION: 6.6
 #
 #    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804
 #      CMAKE_GENERATOR: 'Unix Makefiles'
@@ -78,35 +78,35 @@ environment:
       CMAKE_PLATFORM: x64
       CMAKE_ARCH_FLAGS: -m64
       COMPILER_ID: gcc
-      QT_ID: Qt5.15
+      QT_VERSION: 5.15
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       CMAKE_ARCH_FLAGS: -m64
       COMPILER_ID: gcc
-      QT_ID: Qt5.15
+      QT_VERSION: 5.15
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       CMAKE_ARCH_FLAGS: -m64
       COMPILER_ID: gcc
-      QT_ID: Qt6.7
+      QT_VERSION: 6.7
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       CMAKE_ARCH_FLAGS: -m64
       COMPILER_ID: gcc
-      QT_ID: Qt5.15
+      QT_VERSION: 5.15
 
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204
       CMAKE_GENERATOR: 'Unix Makefiles'
       CMAKE_PLATFORM: x64
       CMAKE_ARCH_FLAGS: -m64
       COMPILER_ID: gcc
-      QT_ID: Qt6.7
+      QT_VERSION: 6.7
 
 #    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
 #      CMAKE_GENERATOR: 'Visual Studio 10 2010'
@@ -239,19 +239,20 @@ install:
       if [ "$COMPILER_ID" = "clang" ]
       then
         brew install jq
-        if [ "$QT_ID" = "5.15" ]
+        if [ "$QT_VERSION" = "5.15" ]
         then
-          export QT_DIR=$HOME/Qt/$QT_ID/clang_64
+          export QT_DIR=$HOME/Qt/$QT_VERSION/clang_64
         else
-          export QT_DIR=$HOME/Qt/$QT_ID/macos
+          export QT_DIR=$HOME/Qt/$QT_VERSION/macos
         fi
         #brew install doxygen
       else
         sudo apt-get -y update
         sudo apt-get -y install freeglut3-dev
         sudo apt-get -y install doxygen jq
-        export QT_DIR=$HOME/Qt/$QT_ID/gcc_64
+        export QT_DIR=$HOME/Qt/$QT_VERSION/gcc_64
       fi
+      export QT_ID=Qt$QT_VERSION
       cd $APPVEYOR_BUILD_FOLDER
   - cmd: |
       choco install jq