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
2381afd4
Unverified
Commit
2381afd4
authored
Dec 19, 2019
by
Dominik Charousset
Committed by
GitHub
Dec 19, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #998
Tweak build scaffold
parents
2b496cbb
308d2e96
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
cmake/FindCAF.cmake
cmake/FindCAF.cmake
+3
-9
configure
configure
+1
-1
No files found.
cmake/FindCAF.cmake
View file @
2381afd4
...
...
@@ -2,7 +2,7 @@
#
# Use this module as follows:
#
# find_package(CAF [COMPONENTS <core|io|open
c
l|...>*] [REQUIRED])
# find_package(CAF [COMPONENTS <core|io|open
ss
l|...>*] [REQUIRED])
#
# Variables used by this module (they can change the default behaviour and need
# to be set before calling find_package):
...
...
@@ -61,6 +61,7 @@ foreach (comp ${CAF_FIND_COMPONENTS})
NAMES
caf/detail/build_config.hpp
HINTS
${
CAF_ROOT_DIR
}
${
header_hints
}
/usr/include
/usr/local/include
...
...
@@ -71,7 +72,7 @@ foreach (comp ${CAF_FIND_COMPONENTS})
message
(
WARNING
"Found all.hpp for CAF core, but not build_config.hpp"
)
set
(
CAF_
${
comp
}
_FOUND false
)
else
()
list
(
APPEND CAF_INCLUDE_DIR
_
${
UPPERCOMP
}
"
${
caf_build_header_path
}
"
)
list
(
APPEND CAF_INCLUDE_DIR
S
"
${
caf_build_header_path
}
"
)
endif
()
endif
()
list
(
APPEND CAF_INCLUDE_DIRS
"
${
CAF_INCLUDE_DIR_
${
UPPERCOMP
}}
"
)
...
...
@@ -146,13 +147,6 @@ if (CAF_openssl_FOUND AND NOT TARGET caf::openssl)
INTERFACE_LINK_LIBRARIES
"OpenSSL::SSL"
)
endif
()
endif
()
if
(
CAF_opencl_FOUND AND NOT TARGET caf::opencl
)
add_library
(
caf::opencl UNKNOWN IMPORTED
)
set_target_properties
(
caf::opencl PROPERTIES
IMPORTED_LOCATION
"
${
CAF_LIBRARY_OPENCL
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
CAF_INCLUDE_DIR_OPENCL
}
"
INTERFACE_LINK_LIBRARIES
"caf::core"
)
endif
()
if
(
CAF_test_FOUND AND NOT TARGET caf::test
)
add_library
(
caf::test INTERFACE IMPORTED
)
set_target_properties
(
caf::test PROPERTIES
...
...
configure
View file @
2381afd4
...
...
@@ -82,7 +82,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--dev-mode sets --build-type=debug, --no-examples,
--no-tools, --with-runtime-checks,
--log-level=trace, and
--sanitizers=address,undefined
--
with-
sanitizers=address,undefined
Influential Environment Variables (only on first invocation):
CXX C++ compiler command
...
...
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