Commit 760a48e5 authored by kra568's avatar kra568

FIX: fixed scripts calling cmake on linux systems

parent fd7129a5
...@@ -9,15 +9,15 @@ win_1: ...@@ -9,15 +9,15 @@ win_1:
before_script: before_script:
- call VsDevCmd.bat - call VsDevCmd.bat
- cd build_scripts/windows - cd build_scripts\windows
- call win_download_dependencies.bat - call win_download_dependencies.bat
- cd ../.. - cd ..\..
script: script:
- cd build_scripts/windows - cd build_scripts\windows
- call win_VS_build_x64_debug.bat - call win_VS_build_x64_debug.bat
- call win_run_tests.bat - call win_run_tests.bat
- cd ../.. - cd ..\..
# Latest Ubuntu with Boost and Exprtk # Latest Ubuntu with Boost and Exprtk
# in system directories # in system directories
...@@ -47,7 +47,7 @@ ubuntu_2: ...@@ -47,7 +47,7 @@ ubuntu_2:
- ./download_dependencies.sh - ./download_dependencies.sh
- cd external_dependencies/boost - cd external_dependencies/boost
- ./bootstrap.sh || cat bootstrap.log - ./bootstrap.sh || cat bootstrap.log
- ./b2 --layout=system variant=release link=shared address-model=64 --with-system --with-serialization --with-random - ./b2 --layout=system variant=release link=static address-model=64 --with-system --with-serialization --with-random
- cd ../.. - cd ../..
- export TERM=xterm - export TERM=xterm
......
...@@ -17,7 +17,7 @@ BUILD_EXAMPLES=yes ...@@ -17,7 +17,7 @@ BUILD_EXAMPLES=yes
BUILD_LIB=yes BUILD_LIB=yes
# Location of the lib4neuro library file? (in case it was already compiled somewhere) # Location of the lib4neuro library file? (in case it was already compiled somewhere)
LIB4NEURO_BIN_DIR=build\lib LIB4NEURO_BIN_DIR=build/lib
# C++ compiler # C++ compiler
CXX_COMPILER="g++-8" CXX_COMPILER="g++-8"
......
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