From 4a6a77f3dde006d30c6efa0483403032b36ac95c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 5 Mar 2021 15:52:52 +0100
Subject: [PATCH] CI win: QTDIR w/o conversion
---
.gitlab-ci.yml | 2 +-
GUI/coregui/CMakeLists.txt | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7035c0e13ac..decbd30947f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ windows:
- cd build
- cmd.exe "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
- cmake --version
- - cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLIB_MAN=OFF -DQTDIR=C:\Qt\5.14.1\msvc2017_64 -DCPACK_IFW_ROOT=C:\Qt\Tools\QtInstallerFramework\3.2 -B. ..
+ - cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLIB_MAN=OFF -DQTDIR=C:/Qt/5.14.1/msvc2017_64 -DCPACK_IFW_ROOT=C:\Qt\Tools\QtInstallerFramework\3.2 -B. ..
- cmake --build . --config Release
- Get-Location
- dir
diff --git a/GUI/coregui/CMakeLists.txt b/GUI/coregui/CMakeLists.txt
index 04358646fbf..b58d7d55ef0 100644
--- a/GUI/coregui/CMakeLists.txt
+++ b/GUI/coregui/CMakeLists.txt
@@ -115,7 +115,6 @@ install (TARGETS ${library_name} DESTINATION ${destination_lib} COMPONENT Librar
if(WIN32)
# --- Qt ---
- string(REGEX REPLACE "\\\\" "/" QTDIR $ENV{QTDIR} ) # Convert C:\Qt\ to C:/Qt/
install(FILES
${QTDIR}/bin/Qt5Widgets.DLL
${QTDIR}/bin/Qt5Core.dll
--
GitLab