From b73c35aae3a009fe1a13774c8e0edcc2d1b6f366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 21 Sep 2021 09:41:06 +0200
Subject: [PATCH] Macro rename from vci_qt5 to vci_qt and renamed
 qt5_install_path to qt_install_path

---
 CI/Windows.bat                   |  8 ++++----
 CI/ci-linux-prepare.sh           | 12 ++++++------
 cmake-library                    |  2 +-
 src/OpenMesh/Apps/CMakeLists.txt |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CI/Windows.bat b/CI/Windows.bat
index 903c74e8..1a1c9f22 100644
--- a/CI/Windows.bat
+++ b/CI/Windows.bat
@@ -25,12 +25,12 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
 
     IF "%ARCHITECTURE%" == "x64" (
       set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
+      set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
     )
 
     IF "%ARCHITECTURE%" == "x32" (
       set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
+      set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
     )
 
 ) 
@@ -43,7 +43,7 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
 
     IF "%ARCHITECTURE%" == "x64" (
       set QT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64
+      set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64
     )
 
 ) 
@@ -57,7 +57,7 @@ IF "%BUILD_PLATFORM%" == "VS2019" (
 
     IF "%ARCHITECTURE%" == "x64" (
       set QT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64
-      set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64
+      set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64
     )
 
 )
diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh
index 485057f5..a18fee41 100755
--- a/CI/ci-linux-prepare.sh
+++ b/CI/ci-linux-prepare.sh
@@ -42,27 +42,27 @@ fi
 if [ "$QTVERSION" == "qt5.13.0" ]; then
   echo "Using QT5.13.0";
   BUILDPATH="$BUILDPATH-qt5.13.0"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64"
 elif [ "$QTVERSION" == "qt5.12.2" ]; then
   echo "Using QT5.12.2";
   BUILDPATH="$BUILDPATH-qt5.12.2"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64"
 elif [ "$QTVERSION" == "qt5.11.2" ]; then
   echo "Using QT5.11.2";
   BUILDPATH="$BUILDPATH-qt5.11.2"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64"
 elif [ "$QTVERSION" == "qt5.9.0" ]; then
   echo "Using QT5.9.0";
   BUILDPATH="$BUILDPATH-qt5.9.0"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
 elif [ "$QTVERSION" == "qt5.13.2" ]; then
   echo "Using QT5.13.2";
   BUILDPATH="$BUILDPATH-qt5.13.2"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64"
 elif [ "$QTVERSION" == "qt5.15.1" ]; then
   echo "Using QT5.15.1";
   BUILDPATH="$BUILDPATH-qt5.15.1"
-  OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64"
+  OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64"
 fi
 
 #=====================================
diff --git a/cmake-library b/cmake-library
index ab9edd27..484e5bd8 160000
--- a/cmake-library
+++ b/cmake-library
@@ -1 +1 @@
-Subproject commit ab9edd278c64b3a387f4d8eb39eb2c2a091d6481
+Subproject commit 484e5bd8377ef837c45ba22f6619c5a72368df41
diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt
index 2e17ab99..441b438f 100644
--- a/src/OpenMesh/Apps/CMakeLists.txt
+++ b/src/OpenMesh/Apps/CMakeLists.txt
@@ -48,7 +48,7 @@ if ( BUILD_APPS )
         Qt5OpenGL
         Qt5Gui
         )
-      vci_qt5 ()
+      vci_qt ()
       set(CMAKE_AUTOMOC ON)
     endif()