diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7035c0e13ac67ff71e52e20f8165fe53a02f1ec8..decbd30947f35b386985dbf279617cd5f444f149 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 04358646fbfca3640e65dffd68f68d7ebe0b53cc..b58d7d55ef0a24e95becd51fb6cee338ab608e16 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