Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
227783ff
Commit
227783ff
authored
Dec 17, 2019
by
Jakob Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix linkage of caf-net tests
parent
df07cde2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
libcaf_net/CMakeLists.txt
libcaf_net/CMakeLists.txt
+5
-6
libcaf_net/src/convert_ip_endpoint.cpp
libcaf_net/src/convert_ip_endpoint.cpp
+2
-0
No files found.
libcaf_net/CMakeLists.txt
View file @
227783ff
...
@@ -106,8 +106,7 @@ set_target_properties(libcaf_net PROPERTIES
...
@@ -106,8 +106,7 @@ set_target_properties(libcaf_net PROPERTIES
# -- install library and header files ------------------------------------------
# -- install library and header files ------------------------------------------
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/caf/detail/build_config.hpp"
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/caf/detail/net_export.hpp"
"
${
CMAKE_BINARY_DIR
}
/caf/detail/net_export.hpp"
DESTINATION
"
${
CMAKE_INSTALL_INCLUDEDIR
}
/caf/detail"
)
DESTINATION
"
${
CMAKE_INSTALL_INCLUDEDIR
}
/caf/detail"
)
install
(
TARGETS libcaf_net
install
(
TARGETS libcaf_net
...
@@ -125,13 +124,13 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
...
@@ -125,13 +124,13 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
if
(
NOT CAF_NO_UNIT_TESTS
)
if
(
NOT CAF_NO_UNIT_TESTS
)
add_executable
(
caf-net-test
add_executable
(
caf-net-test
"
${
CAF_ROOT_DIR
}
/../libcaf_test/src/caf
-test.cpp"
"
${
PROJECT_SOURCE_DIR
}
/cmake/incubator
-test.cpp"
"
${
CAF_
ROOT_DIR
}
/../libcaf_test
/caf/test/unit_test.hpp"
"
${
CAF_
INCLUDE_DIR_TEST
}
/caf/test/unit_test.hpp"
"
${
CAF_
ROOT_DIR
}
/../libcaf_test
/caf/test/unit_test_impl.hpp"
"
${
CAF_
INCLUDE_DIR_TEST
}
/caf/test/unit_test_impl.hpp"
${
CAF_NET_TEST_SOURCES
}
${
CAF_NET_TEST_SOURCES
}
$<TARGET_OBJECTS:libcaf_net_obj>
)
$<TARGET_OBJECTS:libcaf_net_obj>
)
target_compile_definitions
(
caf-net-test PRIVATE libcaf_net_EXPORTS
)
target_compile_definitions
(
caf-net-test PRIVATE libcaf_net_EXPORTS
)
target_link_libraries
(
caf-net-test
${
CAF_EXTRA_LDFLAGS
}
)
target_link_libraries
(
caf-net-test
${
CAF_EXTRA_LDFLAGS
}
${
CAF_LIBRARIES
}
)
add_test_suites
(
caf-net-test
add_test_suites
(
caf-net-test
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
${
CAF_NET_TEST_SOURCES
}
)
${
CAF_NET_TEST_SOURCES
}
)
...
...
libcaf_net/src/convert_ip_endpoint.cpp
View file @
227783ff
...
@@ -18,6 +18,8 @@
...
@@ -18,6 +18,8 @@
#include "caf/detail/convert_ip_endpoint.hpp"
#include "caf/detail/convert_ip_endpoint.hpp"
#include <cstring>
#include "caf/error.hpp"
#include "caf/error.hpp"
#include "caf/ipv4_endpoint.hpp"
#include "caf/ipv4_endpoint.hpp"
#include "caf/ipv6_endpoint.hpp"
#include "caf/ipv6_endpoint.hpp"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment