Commit 452a916e authored by Martin Beseda's avatar Martin Beseda
Browse files

[FIX] [WIN] Trying to fix CI on Windows

parent 96cce792
......@@ -63,7 +63,7 @@ win_visual_studio_2017_static_manual:
before_script:
- 'rmdir /s /q build external_dependencies\*'
- 'call VsDevCmd.bat &&
call "C:\Program Files (x86)\IntelSWTools\parallel_studio_xe_2019.5.068\compilers_and_libraries_2019\windows\bin\ipsxe-comp-vars.bat" intel64 vs2017 &&
call "C:\Program Files (x86)\IntelSWTools\parallel_studio_xe_2019.5.068\bin\psxevars.bat" intel64 vs2017 &&
copy /b NUL prep_success'
artifacts:
......@@ -135,6 +135,10 @@ win_visual_studio_2015_static_manual:
script:
- 'if not exist prep_success ( exit 1 )'
- 'where cl'
- 'where ifort'
- 'echo %cd%'
- 'echo %PATH%'
- 'call build_scripts\windows\win_VS2015_build_x64_release.bat'
# Latest Ubuntu
......
......@@ -17,7 +17,7 @@ IF(${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
SET(PREPROCESSOR_FLAG -fpp)
ENDIF()
# Fortran compile options
# Fortran compile options
SET(CMAKE_Fortran_FLAGS -ffree-line-length-none ${CMAKE_Fortran_FLAGS})
# Looking for MPI
......
......@@ -7,16 +7,13 @@ rem call VsDevCmd.bat
title Building the 'lib4neuro' project for Release [preparing makefiles]
echo "WIN_EXPRTK_ROOT"
echo %WIN_EXPRTK_ROOT%
rem C++ compiler (Requires Visual Studio 2015)
set CXX_COMPILER=cl
set C_COMPILER=cl
REM set CXX_COMPILER=cl
REM set C_COMPILER=cl
set MAKEFILE_GENERATOR="Visual Studio 14 2015 Win64"
cmake -G %MAKEFILE_GENERATOR% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%LINK_TYPE% -DLIB4NEURO_INCLUDE_DIR=%LIB4NEURO_INCLUDE_DIR% -DARMADILLO_ROOT=%WIN_ARMADILLO_ROOT% -DBOOST_ROOT=%WIN_BOOST_ROOT% -DEXPRTK_ROOT=%WIN_EXPRTK_ROOT% -DTURTLE_ROOT=%WIN_TURTLE_ROOT% -S . -B build
cmake -G %MAKEFILE_GENERATOR% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%LINK_TYPE% -DLIB4NEURO_INCLUDE_DIR=%LIB4NEURO_INCLUDE_DIR% -DARMADILLO_ROOT=%WIN_ARMADILLO_ROOT% -DBOOST_ROOT=%WIN_BOOST_ROOT% -DEXPRTK_ROOT=%WIN_EXPRTK_ROOT% -DTURTLE_ROOT=%WIN_TURTLE_ROOT% -S . -B build
title Building the 'lib4neuro' project for Release [building]
......
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