Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
lib4neuro
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MolDyn
lib4neuro
Commits
581ce7c2
Commit
581ce7c2
authored
6 years ago
by
Martin Beseda
Browse files
Options
Downloads
Patches
Plain Diff
Trying to fix CI
parent
75b85226
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+24
-2
24 additions, 2 deletions
.gitlab-ci.yml
src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/CMakeLists.txt
with
25 additions
and
3 deletions
.gitlab-ci.yml
+
24
−
2
View file @
581ce7c2
# 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
:
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
1
−
1
View file @
581ce7c2
...
...
@@ -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
"s
tatic
"
)
elseif
(
WIN32 AND
"
${
DEPENDENCIES_LINK_TYPE
}
"
STREQUAL
"s
hared
"
)
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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment