Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
centreon-connectors
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
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
centreon
centreon-connectors
Commits
eedafefd
Unverified
Commit
eedafefd
authored
3 years ago
by
David Boucher
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix(conan): build is back (#27)
REFS: MON-7244
parent
d83fcf60
No related branches found
Branches containing commit
Tags
20.04.1
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+6
-0
6 additions, 0 deletions
CHANGELOG.md
CMakeLists.txt
+6
-6
6 additions, 6 deletions
CMakeLists.txt
conanfile.txt
+3
-3
3 additions, 3 deletions
conanfile.txt
with
15 additions
and
9 deletions
CHANGELOG.md
+
6
−
0
View file @
eedafefd
...
...
@@ -9,3 +9,9 @@
*Unit tests*
Unit tests have been updated due to changes in the clib.
*Build*
Build with packages coming from bintray was broken. It is fixed now with
conan-center.
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
6
−
6
View file @
eedafefd
# Global options.
cmake_minimum_required
(
VERSION 2.8.12
)
project
(
connectors CXX
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
1
"
)
add_definitions
(
"-D_GLIBCXX_USE_CXX11_ABI=
0
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
4
"
)
add_definitions
(
"-D_GLIBCXX_USE_CXX11_ABI=
1
"
)
set
(
CONNECTOR_MAJOR 20
)
set
(
CONNECTOR_MINOR 04
)
...
...
@@ -46,12 +46,12 @@ add_subdirectory(ssh)
# Testing.
option
(
WITH_TESTING
"Build unit tests."
OFF
)
if
(
WITH_TESTING
)
find_package
(
gt
est REQUIRED
)
find_package
(
GT
est REQUIRED
)
include_directories
(
${
gt
est_INCLUDE_DIRS
}
)
include_directories
(
${
GT
est_INCLUDE_DIRS
}
)
include_directories
(
/usr/lib64/perl5/CORE
)
link_directories
(
${
gt
est_LIB_DIRS
}
)
link_directories
(
${
GT
est_LIB_DIRS
}
)
include_directories
(
${
CMAKE_SOURCE_DIR
}
/perl/inc
)
include_directories
(
${
CMAKE_SOURCE_DIR
}
/ssh/inc
)
...
...
@@ -87,5 +87,5 @@ if (WITH_TESTING)
${
CMAKE_SOURCE_DIR
}
/ssh/test/sessions.cc
)
target_link_libraries
(
ut
${
gt
est_LIBS
}
${
CLIB_LIBRARIES
}
${
PERL_LIBRARIES
}
${
fmt_LIBS
}
${
spdlog_LIBS
}
${
LIBSSH2_LIBRARIES
}
)
target_link_libraries
(
ut
${
GT
est_LIBS
}
${
CLIB_LIBRARIES
}
${
PERL_LIBRARIES
}
${
fmt_LIBS
}
${
spdlog_LIBS
}
${
LIBSSH2_LIBRARIES
}
)
endif
(
WITH_TESTING
)
This diff is collapsed.
Click to expand it.
conanfile.txt
+
3
−
3
View file @
eedafefd
[requires]
gtest/
1.8.1@bincrafters/stable
fmt/7.1.
2
spdlog/1.8.
1
gtest/
cci.20210126
fmt/7.1.
3
spdlog/1.8.
5
[generators]
cmake_paths
...
...
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