Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
opendht
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Model registry
Analyze
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
savoirfairelinux
opendht
Commits
b66fa73c
Commit
b66fa73c
authored
6 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
test: include cppunit headers
parent
1ca181db
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+8
-5
8 additions, 5 deletions
CMakeLists.txt
with
8 additions
and
5 deletions
CMakeLists.txt
+
8
−
5
View file @
b66fa73c
...
@@ -70,6 +70,8 @@ set (CMAKE_CXX_STANDARD_REQUIRED on)
...
@@ -70,6 +70,8 @@ set (CMAKE_CXX_STANDARD_REQUIRED on)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -pedantic-errors -fvisibility=hidden"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -pedantic-errors -fvisibility=hidden"
)
if
(
OPENDHT_SANITIZE
)
if
(
OPENDHT_SANITIZE
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fsanitize=address -fstack-protector-strong"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fsanitize=address -fstack-protector-strong"
)
else
()
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fno-stack-protector"
)
endif
()
endif
()
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT"
)
if
(
NOT CMAKE_BUILD_TYPE
)
if
(
NOT CMAKE_BUILD_TYPE
)
...
@@ -304,7 +306,7 @@ install (EXPORT opendht DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht FILE o
...
@@ -304,7 +306,7 @@ install (EXPORT opendht DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht FILE o
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/opendhtConfigVersion.cmake DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake/opendht
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/opendhtConfigVersion.cmake DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
/cmake/opendht
)
# Unit tests
# Unit tests
IF
(
OPENDHT_TESTS
)
if
(
OPENDHT_TESTS
)
FIND_PACKAGE
(
Cppunit REQUIRED
)
FIND_PACKAGE
(
Cppunit REQUIRED
)
# unit testing
# unit testing
list
(
APPEND test_FILES
list
(
APPEND test_FILES
...
@@ -325,16 +327,17 @@ IF(OPENDHT_TESTS)
...
@@ -325,16 +327,17 @@ IF(OPENDHT_TESTS)
tests/tests_runner.cpp
tests/tests_runner.cpp
${
test_FILES
}
${
test_FILES
}
)
)
target_include_directories
(
opendht_unit_tests SYSTEM PRIVATE
${
CPPUNIT_INCLUDE_DIRS
}
)
if
(
OPENDHT_SHARED
)
if
(
OPENDHT_SHARED
)
TARGET_LINK_LIBRARIES
(
opendht_unit_tests opendht
)
target_link_libraries
(
opendht_unit_tests opendht
)
else
()
else
()
TARGET_LINK_LIBRARIES
(
opendht_unit_tests opendht-static
)
target_link_libraries
(
opendht_unit_tests opendht-static
)
endif
()
endif
()
TARGET_LINK_LIBRARIES
(
opendht_unit_tests
target_link_libraries
(
opendht_unit_tests
${
CMAKE_THREAD_LIBS_INIT
}
${
CMAKE_THREAD_LIBS_INIT
}
${
CPPUNIT_LIBRARIES
}
${
CPPUNIT_LIBRARIES
}
${
GNUTLS_LIBRARIES
}
${
GNUTLS_LIBRARIES
}
)
)
enable_testing
()
enable_testing
()
add_test
(
TEST opendht_unit_tests
)
add_test
(
TEST opendht_unit_tests
)
ENDIF
()
endif
()
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