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

Trying to fix CI

parent 75b85226
No related branches found
No related tags found
No related merge requests found
# Windows 10 with Boost and Exprtk
# downloaded and compiled locally as
# submodules
win_visual_studio:
# submodules and linked statically
win_visual_studio_static_deps:
tags:
- Win
before_script:
- call VsDevCmd.bat
- cd build_scripts\windows
- call win_download_dependencies.bat
- cd ..\..
- cd build_scripts\windows
- set DEPENDENCIES_LINK_TYPE=static
- call win_VS_build_x64_debug.bat
script:
- call win_run_tests.bat
# Windows 10 with Boost and Exprtk
# downloaded and compiled locally as
# submodules and link dynamically
#
# CURRENTLY NOT SUPPORTED!
win_visual_studio_shared_deps:
tags:
- Win
......@@ -17,6 +38,7 @@ win_visual_studio:
script:
- call win_run_tests.bat
# Latest Ubuntu with Boost and Exprtk
# in system directories
ubuntu_boost_system:
......
......@@ -61,7 +61,7 @@ if ("${BUILD_LIB}" STREQUAL "yes")
if(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
add_library(libboost_unit_test STATIC boost_test_lib_dummy.cpp)
add_library(libexprtk STATIC exprtk.cpp)
elseif(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
elseif(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
message(FATAL_ERROR "Only static linking of external dependencies is supported for Windows systems now!")
elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
add_library(boost_unit_test STATIC boost_test_lib_dummy.cpp)
......
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