Commit 2b4538de authored by schultz's avatar schultz

changed libpath to libpathbase, because windows command shell seems not to

evaluate variables within a if command block
parent c4b4b79a
Pipeline #7080 passed with stages
in 7 minutes and 17 seconds
...@@ -49,7 +49,7 @@ IF "%BUILD_PLATFORM%" == "VS2013" ( ...@@ -49,7 +49,7 @@ IF "%BUILD_PLATFORM%" == "VS2013" (
) )
SET BOOST_ROOT= SET BOOST_ROOT=
set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DBOOST_ROOT="%LIBPATH%/%ARCHITECTURE%/boost_1_59_0" -DBOOST_LIBRARYDIR="%LIBPATH%/%ARCHITECTURE%/boost_1_59_0/lib64-msvc-12.0" set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DBOOST_ROOT="%LIBPATH_BASE%/%ARCHITECTURE%/boost_1_59_0" -DBOOST_LIBRARYDIR="%LIBPATH_BASE%/%ARCHITECTURE%/boost_1_59_0/lib64-msvc-12.0"
) )
IF "%BUILD_PLATFORM%" == "VS2015" ( IF "%BUILD_PLATFORM%" == "VS2015" (
...@@ -67,7 +67,7 @@ IF "%BUILD_PLATFORM%" == "VS2017" ( ...@@ -67,7 +67,7 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.com" set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.com"
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt%QT_REV%\%QT_REV%\msvc2017_64%QT_SUFFIX% set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt%QT_REV%\%QT_REV%\msvc2017_64%QT_SUFFIX%
set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DBOOST_ROOT="%LIBPATH%/%ARCHITECTURE%/boost_1_67_0" -DBOOST_LIBRARYDIR="%LIBPATH%/%ARCHITECTURE%/boost_1_67_0/lib64-msvc-14.1" set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -DBOOST_ROOT="%LIBPATH_BASE%/%ARCHITECTURE%/boost_1_67_0" -DBOOST_LIBRARYDIR="%LIBPATH_BASE%/%ARCHITECTURE%/boost_1_67_0/lib64-msvc-14.1"
) )
ECHO "=============================================================" ECHO "============================================================="
...@@ -79,6 +79,7 @@ ECHO "GTESTVERSION : %GTESTVERSION%" ...@@ -79,6 +79,7 @@ ECHO "GTESTVERSION : %GTESTVERSION%"
ECHO "GENERATOR : %GENERATOR%" ECHO "GENERATOR : %GENERATOR%"
ECHO "VS_PATH : %VS_PATH%" ECHO "VS_PATH : %VS_PATH%"
ECHO "LIBPATH : %LIBPATH%" ECHO "LIBPATH : %LIBPATH%"
ECHO "LIBPATH_BASE : %LIBPATH_BASE%"
ECHO "QT_INSTALL_PATH : %QT_INSTALL_PATH%" ECHO "QT_INSTALL_PATH : %QT_INSTALL_PATH%"
ECHO "QT_INSTALL_PATH : %QT_BASE_CONFIG%" ECHO "QT_INSTALL_PATH : %QT_BASE_CONFIG%"
ECHO "CMAKE_CONFIGURATION : %CMAKE_CONFIGURATION%" ECHO "CMAKE_CONFIGURATION : %CMAKE_CONFIGURATION%"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment