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
6daf86c2
Commit
6daf86c2
authored
6 years ago
by
Martin Beseda
Browse files
Options
Downloads
Patches
Plain Diff
Enabled Windows shared dependencies test in CI
parent
1f44eec7
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+15
-16
15 additions, 16 deletions
.gitlab-ci.yml
build_scripts/windows/win_VS_build_x64_debug.bat
+2
-2
2 additions, 2 deletions
build_scripts/windows/win_VS_build_x64_debug.bat
src/CMakeLists.txt
+2
-2
2 additions, 2 deletions
src/CMakeLists.txt
with
19 additions
and
20 deletions
.gitlab-ci.yml
+
15
−
16
View file @
6daf86c2
...
...
@@ -21,22 +21,21 @@ win_visual_studio_static_deps:
# downloaded and compiled locally as
# submodules and link dynamically
#
# CURRENTLY NOT SUPPORTED!
#win_visual_studio_shared_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=shared
# - call win_VS_build_x64_debug.bat
#
# script:
# - call win_run_tests.bat
win_visual_studio_shared_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=shared
-
call win_VS_build_x64_debug.bat
script
:
-
call win_run_tests.bat
# Latest Ubuntu with Boost and Exprtk
...
...
This diff is collapsed.
Click to expand it.
build_scripts/windows/win_VS_build_x64_debug.bat
+
2
−
2
View file @
6daf86c2
...
...
@@ -103,10 +103,10 @@ IF "%BUILD_SOMETHING_LIB%"=="yes" (
set
MAKEFILE_GENERATOR
=
"Visual Studio 15 2017 Win64"
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%
-DLIB
4
NEURO_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%
-DLIB
4
NEURO_DIR
=
build
\lib
-DDEPENDENCIES
_LINK_TYPE
=
%DEPENDENCIES_LINK_TYPE%
.
||
exit
1
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
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
2
−
2
View file @
6daf86c2
...
...
@@ -60,8 +60,8 @@ if ("${BUILD_LIB}" STREQUAL "yes")
# set(PREFIX "lib")
# endif()
if
(
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
(
${
PREFIX
}
boost_unit_test STATIC boost_test_lib_dummy.cpp
)
elseif
(
"
${
DEPENDENCIES_LINK_TYPE
}
"
STREQUAL
"static"
)
add_library
(
${
PREFIX
}
boost_unit_test STATIC boost_test_lib_dummy.cpp
)
elseif
(
"
${
DEPENDENCIES_LINK_TYPE
}
"
STREQUAL
"shared"
)
add_library
(
${
PREFIX
}
boost_unit_test SHARED 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