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

Enabled Windows shared dependencies test in CI

parent 1f44eec7
No related branches found
No related tags found
No related merge requests found
...@@ -21,22 +21,21 @@ win_visual_studio_static_deps: ...@@ -21,22 +21,21 @@ win_visual_studio_static_deps:
# downloaded and compiled locally as # downloaded and compiled locally as
# submodules and link dynamically # submodules and link dynamically
# #
# CURRENTLY NOT SUPPORTED! win_visual_studio_shared_deps:
#win_visual_studio_shared_deps: tags:
# tags: - Win
# - Win
# 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 ..\.. - cd build_scripts\windows
# - cd build_scripts\windows - set DEPENDENCIES_LINK_TYPE=shared
# - set DEPENDENCIES_LINK_TYPE=shared - call win_VS_build_x64_debug.bat
# - call win_VS_build_x64_debug.bat
# script:
# script: - call win_run_tests.bat
# - call win_run_tests.bat
# Latest Ubuntu with Boost and Exprtk # Latest Ubuntu with Boost and Exprtk
......
...@@ -103,10 +103,10 @@ IF "%BUILD_SOMETHING_LIB%"=="yes" ( ...@@ -103,10 +103,10 @@ IF "%BUILD_SOMETHING_LIB%"=="yes" (
set MAKEFILE_GENERATOR="Visual Studio 15 2017 Win64" set MAKEFILE_GENERATOR="Visual Studio 15 2017 Win64"
cd ..\.. cd ..\..
cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%DEPENDENCIES_LINK_TYPE% . || exit 1 cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%DEPENDENCIES_LINK_TYPE% . || exit 1
title Building the 'lib4neuro' project for Debug (building) title Building the 'lib4neuro' project for Debug (building)
(cmake --build . --config Debug) && (echo "Build complete.") || exit 1 (cmake --build .) && (echo "Build complete.") || exit 1
cd build_scripts\windows cd build_scripts\windows
......
...@@ -60,8 +60,8 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -60,8 +60,8 @@ if ("${BUILD_LIB}" STREQUAL "yes")
# set(PREFIX "lib") # set(PREFIX "lib")
# endif() # endif()
if(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared") if(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
message(FATAL_ERROR "Only static linking of external dependencies is supported for Windows systems now!") add_library(${PREFIX}boost_unit_test STATIC boost_test_lib_dummy.cpp)
elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static") elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
add_library(${PREFIX}boost_unit_test STATIC boost_test_lib_dummy.cpp) add_library(${PREFIX}boost_unit_test STATIC boost_test_lib_dummy.cpp)
elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared") elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
add_library(${PREFIX}boost_unit_test SHARED boost_test_lib_dummy.cpp) add_library(${PREFIX}boost_unit_test SHARED 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