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

Merge branch 'dev' of code.it4i.cz:bes0030/4Neuro into dev

parents 19fb4c60 d9df2b25
No related branches found
No related tags found
No related merge requests found
...@@ -8,13 +8,12 @@ win_visual_studio_static_local_deps: ...@@ -8,13 +8,12 @@ win_visual_studio_static_local_deps:
before_script: before_script:
- call VsDevCmd.bat - call VsDevCmd.bat
- cd build_scripts\windows
- set DEPENDENCIES_LINK_TYPE=static - set DEPENDENCIES_LINK_TYPE=static
- set clean_after=yes - set clean_after=yes
- call win_VS_build_x64_release.bat - call build_scripts\windows\win_VS_build_x64_release.bat
script: script:
- cd ..\.. # - cd ..\..
- cd build_scripts\windows - cd build_scripts\windows
# - call win_run_tests.bat # - call win_run_tests.bat
- cd ..\.. - cd ..\..
......
@echo off
title Building the 'lib4neuro' project for Debug title Building the 'lib4neuro' project for Debug
set BUILD_SOMETHING_LIB=yes set BUILD_SOMETHING_LIB=yes
......
@echo off
title Building the 'lib4neuro' project for Release title Building the 'lib4neuro' project for Release
set BUILD_SOMETHING_LIB=yes set BUILD_SOMETHING_LIB=yes
......
...@@ -113,6 +113,7 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -113,6 +113,7 @@ if ("${BUILD_LIB}" STREQUAL "yes")
${OpenBLAS_LIBRARIES} ${OpenBLAS_LIBRARIES}
${BLAS_LIBRARIES} ${BLAS_LIBRARIES}
${LAPACK_LIBRARIES} ${LAPACK_LIBRARIES}
${GFORT}
) )
target_include_directories( target_include_directories(
......
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