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
3d4c238a
Commit
3d4c238a
authored
Apr 14, 2020
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build with unit tests enabled
parent
962c53d0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
14 deletions
+10
-14
configure
configure
+1
-5
examples/CMakeLists.txt
examples/CMakeLists.txt
+3
-3
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+2
-2
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+3
-3
libcaf_openssl/CMakeLists.txt
libcaf_openssl/CMakeLists.txt
+1
-1
No files found.
configure
View file @
3d4c238a
...
@@ -110,7 +110,6 @@ set_build_flag() {
...
@@ -110,7 +110,6 @@ set_build_flag() {
exit
1
exit
1
;;
;;
esac
esac
echo
"append_cache_entry
$FlagName
BOOL
$2
"
append_cache_entry
$FlagName
BOOL
$2
append_cache_entry
$FlagName
BOOL
$2
}
}
...
@@ -125,10 +124,7 @@ while [ $# -ne 0 ]; do
...
@@ -125,10 +124,7 @@ while [ $# -ne 0 ]; do
--
*
=
*
)
optarg
=
`
echo
"
$1
"
|
sed
's/[-_a-zA-Z0-9]*=//'
`
;;
--
*
=
*
)
optarg
=
`
echo
"
$1
"
|
sed
's/[-_a-zA-Z0-9]*=//'
`
;;
--enable-
*
)
optarg
=
`
echo
"
$1
"
|
sed
's/--enable-//'
`
;;
--enable-
*
)
optarg
=
`
echo
"
$1
"
|
sed
's/--enable-//'
`
;;
--disable-
*
)
optarg
=
`
echo
"
$1
"
|
sed
's/--disable-//'
`
;;
--disable-
*
)
optarg
=
`
echo
"
$1
"
|
sed
's/--disable-//'
`
;;
*
)
*
)
;;
echo
"Invalid syntax '
$1
'. Try
$0
--help to see available options."
exit
1
;;
esac
esac
# Consume current input.
# Consume current input.
case
"
$1
"
in
case
"
$1
"
in
...
...
examples/CMakeLists.txt
View file @
3d4c238a
...
@@ -68,7 +68,7 @@ if(TARGET CAF::io)
...
@@ -68,7 +68,7 @@ if(TARGET CAF::io)
endif
()
endif
()
if
(
CAF_
BUILD
_PROTOBUF_EXAMPLES
)
if
(
CAF_
ENABLE
_PROTOBUF_EXAMPLES
)
find_package
(
Protobuf REQUIRED
)
find_package
(
Protobuf REQUIRED
)
if
(
NOT PROTOBUF_PROTOC_EXECUTABLE
)
if
(
NOT PROTOBUF_PROTOC_EXECUTABLE
)
message
(
FATAL_ERROR
"CMake was unable to set PROTOBUF_PROTOC_EXECUTABLE"
)
message
(
FATAL_ERROR
"CMake was unable to set PROTOBUF_PROTOC_EXECUTABLE"
)
...
@@ -81,7 +81,7 @@ if(CAF_BUILD_PROTOBUF_EXAMPLES)
...
@@ -81,7 +81,7 @@ if(CAF_BUILD_PROTOBUF_EXAMPLES)
add_dependencies
(
protobuf_broker all_examples
)
add_dependencies
(
protobuf_broker all_examples
)
endif
()
endif
()
if
(
CAF_
BUILD
_QT5_EXAMPLES
)
if
(
CAF_
ENABLE
_QT5_EXAMPLES
)
find_package
(
Qt5 COMPONENTS Core Gui Widgets REQUIRED
)
find_package
(
Qt5 COMPONENTS Core Gui Widgets REQUIRED
)
message
(
STATUS
"Found Qt5"
)
message
(
STATUS
"Found Qt5"
)
#include(${QT_USE_FILE})
#include(${QT_USE_FILE})
...
@@ -108,7 +108,7 @@ if(CAF_BUILD_QT5_EXAMPLES)
...
@@ -108,7 +108,7 @@ if(CAF_BUILD_QT5_EXAMPLES)
add_dependencies
(
qt_group_chat all_examples
)
add_dependencies
(
qt_group_chat all_examples
)
endif
()
endif
()
if
(
CAF_
BUILD
_CURL_EXAMPLES
)
if
(
CAF_
ENABLE
_CURL_EXAMPLES
)
find_package
(
CURL REQUIRED
)
find_package
(
CURL REQUIRED
)
add_executable
(
curl_fuse curl/curl_fuse.cpp
)
add_executable
(
curl_fuse curl/curl_fuse.cpp
)
include_directories
(
${
CURL_INCLUDE_DIRS
}
)
include_directories
(
${
CURL_INCLUDE_DIRS
}
)
...
...
libcaf_core/CMakeLists.txt
View file @
3d4c238a
...
@@ -182,7 +182,7 @@ endif()
...
@@ -182,7 +182,7 @@ endif()
target_link_libraries
(
libcaf_core PUBLIC Threads::Threads
)
target_link_libraries
(
libcaf_core PUBLIC Threads::Threads
)
if
(
MSVC
)
if
(
MSVC
)
target_link_libraries
(
libcaf_
io
PUBLIC iphlpapi
)
target_link_libraries
(
libcaf_
core
PUBLIC iphlpapi
)
endif
()
endif
()
if
(
CAF_SANITIZERS
)
if
(
CAF_SANITIZERS
)
...
@@ -223,7 +223,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
...
@@ -223,7 +223,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
# -- build unit tests ----------------------------------------------------------
# -- build unit tests ----------------------------------------------------------
if
(
NOT CAF_
BUILD
_TESTING
)
if
(
NOT CAF_
ENABLE
_TESTING
)
return
()
return
()
endif
()
endif
()
...
...
libcaf_io/CMakeLists.txt
View file @
3d4c238a
...
@@ -112,7 +112,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
...
@@ -112,7 +112,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
# -- build unit tests ----------------------------------------------------------
# -- build unit tests ----------------------------------------------------------
if
(
NOT CAF_
BUILD
_TESTING
)
if
(
NOT CAF_
ENABLE
_TESTING
)
return
()
return
()
endif
()
endif
()
...
@@ -124,9 +124,9 @@ target_include_directories(caf-io-test PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/test
...
@@ -124,9 +124,9 @@ target_include_directories(caf-io-test PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/test
target_compile_definitions
(
caf-io-test PRIVATE libcaf_io_EXPORTS
)
target_compile_definitions
(
caf-io-test PRIVATE libcaf_io_EXPORTS
)
target_link_libraries
(
caf-io-test CAF::core CAF::test
)
target_link_libraries
(
caf-io-test
PRIVATE
CAF::core CAF::test
)
target_link_libraries
(
caf-
core
-test PRIVATE
target_link_libraries
(
caf-
io
-test PRIVATE
$<TARGET_PROPERTY:libcaf_io,INTERFACE_LINK_LIBRARIES>
)
$<TARGET_PROPERTY:libcaf_io,INTERFACE_LINK_LIBRARIES>
)
target_include_directories
(
caf-io-test PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
target_include_directories
(
caf-io-test PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
...
...
libcaf_openssl/CMakeLists.txt
View file @
3d4c238a
...
@@ -78,7 +78,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
...
@@ -78,7 +78,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
# -- build unit tests ----------------------------------------------------------
# -- build unit tests ----------------------------------------------------------
if
(
NOT CAF_
BUILD
_TESTING
)
if
(
NOT CAF_
ENABLE
_TESTING
)
return
()
return
()
endif
()
endif
()
...
...
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