diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3849dec0050f35e79601c9c209636dd7e0e7ff0d..b1fe845d4afadbe5a282d1bfdffa583b2d1cac8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ win_visual_studio: - call win_download_dependencies.bat - cd ..\.. - cd build_scripts\windows + - export DEPENDENCIES_LINK_TYPE=shared - call win_VS_build_x64_debug.bat || exit 1 script: diff --git a/build_scripts/windows/win_VS_build_x64_debug.bat b/build_scripts/windows/win_VS_build_x64_debug.bat index af04868ccaab0ef86661966ca9e85219690cec1b..e6a3b8bc1dada340e42739d998a80a519e6768dd 100644 --- a/build_scripts/windows/win_VS_build_x64_debug.bat +++ b/build_scripts/windows/win_VS_build_x64_debug.bat @@ -69,7 +69,7 @@ IF "%REBUILD_BOOST%"=="yes" ( cd external_dependencies\boost - .\b2 --layout=system variant=debug link=static address-model=64 --with-system --with-serialization --with-random + .\b2 --layout=system variant=debug link=${DEPENDENCIES_LINK_TYPE} address-model=64 --with-system --with-serialization --with-random cd ..\..\build_scripts\windows ) @@ -97,10 +97,10 @@ IF "%BUILD_SOMETHING_LIB%"=="yes" ( set MAKEFILE_GENERATOR="Visual Studio 15 2017 Win64" cd ..\.. - cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib . + cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%DEPENDENCIES_LINK_TYPE% . title Building the 'lib4neuro' project for Debug (building) - (cmake --build . --config Debug > build.log) && (echo "Build complete.") || (echo "Build finished with errors!") + (cmake --build . --config Debug) && (echo "Build complete.") || (echo "Build finished with errors!") cd build_scripts\windows