Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Macro rename from vci_qt5 to vci_qt and renamed qt5_install_path to qt_install_path

Browse Source
This commit is contained in:
Jan Möbius
2021-09-21 09:41:06 +02:00
parent 919abd8326
commit b73c35aae3
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CI/Windows.bat
View File

@@ -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
)
)

12
CI/ci-linux-prepare.sh
View File

@@ -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
#=====================================

2
cmake-library

Submodule cmake-library updated: ab9edd278c...484e5bd837

2
src/OpenMesh/Apps/CMakeLists.txt
View File

@@ -48,7 +48,7 @@ if ( BUILD_APPS )
Qt5OpenGL
Qt5Gui
)
vci_qt5 ()
vci_qt ()
set(CMAKE_AUTOMOC ON)
endif()