Skip to content
Snippets Groups Projects
Commit 7b64abe5 authored by Martin Beseda's avatar Martin Beseda
Browse files

Trying to fix Windows compilation

parent 30bf3f7a
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,7 @@ win_visual_studio: ...@@ -11,6 +11,7 @@ win_visual_studio:
- call win_download_dependencies.bat - call win_download_dependencies.bat
- cd ..\.. - cd ..\..
- cd build_scripts\windows - cd build_scripts\windows
- export DEPENDENCIES_LINK_TYPE=shared
- call win_VS_build_x64_debug.bat || exit 1 - call win_VS_build_x64_debug.bat || exit 1
script: script:
......
...@@ -69,7 +69,7 @@ IF "%REBUILD_BOOST%"=="yes" ( ...@@ -69,7 +69,7 @@ IF "%REBUILD_BOOST%"=="yes" (
cd external_dependencies\boost 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 cd ..\..\build_scripts\windows
) )
...@@ -97,10 +97,10 @@ IF "%BUILD_SOMETHING_LIB%"=="yes" ( ...@@ -97,10 +97,10 @@ IF "%BUILD_SOMETHING_LIB%"=="yes" (
set MAKEFILE_GENERATOR="Visual Studio 15 2017 Win64" set MAKEFILE_GENERATOR="Visual Studio 15 2017 Win64"
cd ..\.. 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) 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 cd build_scripts\windows
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment