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

Trying to fix CI

parent b89bc930
No related branches found
No related tags found
No related merge requests found
......@@ -39,65 +39,65 @@ win_visual_studio_static_deps:
# - call win_run_tests.bat
#
#
## Latest Ubuntu with Boost and Exprtk
## in system directories, Boost
## installed from the official repository
## => only dynamical linking possible
#ubuntu_boost_system:
# tags:
# - centos7
#
# image: martinbeseda/dockertest:latest
#
# before_script:
# - rm -rf external_dependencies
# - git clone https://github.com/ArashPartow/exprtk.git
# - cp exprtk/exprtk.hpp /usr/include
# - export TERM=xterm
# - cd build_scripts/linux
# - export DEPENDENCIES_LINK_TYPE=shared
# - ./linux_gcc_build_x64_debug_system.sh
#
# script:
# - './linux_run_tests.sh'
#
## Latest Ubuntu with Boost and Exprtk
## compiled locally as submodules and
## linked statically
#ubuntu_boost_local_static_deps:
# tags:
# - centos7
#
# image: martinbeseda/ubuntu-ci:latest
#
# before_script:
# - cd build_scripts/linux
# - ./download_dependencies.sh
# - cd ../..
# - cd build_scripts/linux
# - export DEPENDENCIES_LINK_TYPE=static
# - ./linux_gcc_build_x64_debug_local.sh
#
# script:
# - './linux_run_tests.sh'
#
## Latest Ubuntu with Boost and Exprtk
## compiled locally as submodules and
## linked dynamically
#ubuntu_boost_local_dynamic_deps:
# tags:
# - centos7
#
# image: martinbeseda/ubuntu-ci:latest
#
# before_script:
# - cd build_scripts/linux
# - ./download_dependencies.sh
# - cd ../..
# - cd build_scripts/linux
# - export DEPENDENCIES_LINK_TYPE=shared
# - ./linux_gcc_build_x64_debug_local.sh
#
# script:
# - './linux_run_tests.sh'
# Latest Ubuntu with Boost and Exprtk
# in system directories, Boost
# installed from the official repository
# => only dynamical linking possible
ubuntu_boost_system:
tags:
- centos7
image: martinbeseda/dockertest:latest
before_script:
- rm -rf external_dependencies
- git clone https://github.com/ArashPartow/exprtk.git
- cp exprtk/exprtk.hpp /usr/include
- export TERM=xterm
- cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=shared
- ./linux_gcc_build_x64_debug_system.sh
script:
- './linux_run_tests.sh'
# Latest Ubuntu with Boost and Exprtk
# compiled locally as submodules and
# linked statically
ubuntu_boost_local_static_deps:
tags:
- centos7
image: martinbeseda/ubuntu-ci:latest
before_script:
- cd build_scripts/linux
- ./download_dependencies.sh
- cd ../..
- cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=static
- ./linux_gcc_build_x64_debug_local.sh
script:
- './linux_run_tests.sh'
# Latest Ubuntu with Boost and Exprtk
# compiled locally as submodules and
# linked dynamically
ubuntu_boost_local_dynamic_deps:
tags:
- centos7
image: martinbeseda/ubuntu-ci:latest
before_script:
- cd build_scripts/linux
- ./download_dependencies.sh
- cd ../..
- cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=shared
- ./linux_gcc_build_x64_debug_local.sh
script:
- './linux_run_tests.sh'
......@@ -59,6 +59,7 @@ message("Looking for external libraries...")
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
set(Boost_USE_MULTITHREADED ON)
set(Boost_DEBUG ON)
set(CMAKE_INCLUDE_PATH ${BOOST_INCLUDEDIR} "${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost" ${CMAKE_INCLUDE_PATH})
set(CMAKE_LIBRARY_PATH ${BOOST_LIBRARYDIR} "${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost/stage/lib" ${CMAKE_LIBRARY_PATH})
......
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