Commit d72a983f authored by Martin Beseda's avatar Martin Beseda
Browse files

[FIX] [CI] Trying to fix Windows CI for manual external dependencies.

parent de5acc27
......@@ -11,6 +11,7 @@ variables:
WIN_BOOST_ROOT: 'C:\Users\suser\Desktop\lib4neuro_dependencies\boost'
WIN_EXPRTK_ROOT: 'C:\Users\suser\Desktop\lib4neuro_dependencies\exprtk'
WIN_TURTLE_ROOT: 'C:\Users\suser\Desktop\lib4neuro_dependencies\turtle'
clean_after: 'yes'
stages:
- build
......@@ -31,10 +32,10 @@ win_visual_studio_static_local:
stage: build
before_script:
- rmdir /s /q build external_dependencies/*
- call VsDevCmd.bat
- set DEPENDENCIES_LINK_TYPE=static
- set clean_after=yes
- 'rmdir /s /q build external_dependencies/*'
- 'call VsDevCmd.bat'
- 'set DEPENDENCIES_LINK_TYPE=static'
- 'set clean_after=yes'
script:
- 'call build_scripts\windows\win_VS_build_x64_release.bat'
......@@ -49,11 +50,11 @@ win_visual_studio_static_manual:
stage: build
variables:
DEPENDENCIES_LINK_TYPE: 'static'
before_script:
- 'rmdir /s /q build external_dependencies/*'
- 'call VsDevCmd.bat'
- 'set DEPENDENCIES_LINK_TYPE=static'
- 'set clean_after=yes'
script:
- 'call build_scripts\windows\win_VS_build_x64_release.bat'
......@@ -73,10 +74,11 @@ win_visual_studio_2015_static_local:
stage: build
variables:
DEPENDENCIES_LINK_TYPE: 'static'
before_script:
- rmdir /s /q build external_dependencies/*
- set DEPENDENCIES_LINK_TYPE=static
- set clean_after=yes
script:
- call build_scripts\windows\win_VS2015_build_x64_release.bat
......
......@@ -7,8 +7,6 @@ string(REPLACE ":" ";" CPATH_ENV "$ENV{CPATH}")
FIND_PACKAGE(PkgConfig)
PKG_CHECK_MODULES(PC_ARMADILLO QUITE ARMADILLO)
MESSAGE("ARMADILLO ROOT $ENV{ARMADILLO_ROOT} ${ARMADILLO_ROOT}")
# Find headers
FIND_PATH(
ARMADILLO_INCLUDE_DIR
......@@ -39,8 +37,6 @@ FIND_PATH(
local
)
MESSAGE(arm inc dir ${ARMADILLO_INCLUDE_DIR}/../examples/lib_win64)
FIND_LIBRARY(ARMADILLO_BLAS_LIB
NAMES blas_win64_MT
PATHS
......
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