Unverified Commit 2381afd4 authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #998

Tweak build scaffold
parents 2b496cbb 308d2e96
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# Use this module as follows: # Use this module as follows:
# #
# find_package(CAF [COMPONENTS <core|io|opencl|...>*] [REQUIRED]) # find_package(CAF [COMPONENTS <core|io|openssl|...>*] [REQUIRED])
# #
# Variables used by this module (they can change the default behaviour and need # Variables used by this module (they can change the default behaviour and need
# to be set before calling find_package): # to be set before calling find_package):
...@@ -61,6 +61,7 @@ foreach (comp ${CAF_FIND_COMPONENTS}) ...@@ -61,6 +61,7 @@ foreach (comp ${CAF_FIND_COMPONENTS})
NAMES NAMES
caf/detail/build_config.hpp caf/detail/build_config.hpp
HINTS HINTS
${CAF_ROOT_DIR}
${header_hints} ${header_hints}
/usr/include /usr/include
/usr/local/include /usr/local/include
...@@ -71,7 +72,7 @@ foreach (comp ${CAF_FIND_COMPONENTS}) ...@@ -71,7 +72,7 @@ foreach (comp ${CAF_FIND_COMPONENTS})
message(WARNING "Found all.hpp for CAF core, but not build_config.hpp") message(WARNING "Found all.hpp for CAF core, but not build_config.hpp")
set(CAF_${comp}_FOUND false) set(CAF_${comp}_FOUND false)
else() else()
list(APPEND CAF_INCLUDE_DIR_${UPPERCOMP} "${caf_build_header_path}") list(APPEND CAF_INCLUDE_DIRS "${caf_build_header_path}")
endif() endif()
endif() endif()
list(APPEND CAF_INCLUDE_DIRS "${CAF_INCLUDE_DIR_${UPPERCOMP}}") list(APPEND CAF_INCLUDE_DIRS "${CAF_INCLUDE_DIR_${UPPERCOMP}}")
...@@ -146,13 +147,6 @@ if (CAF_openssl_FOUND AND NOT TARGET caf::openssl) ...@@ -146,13 +147,6 @@ if (CAF_openssl_FOUND AND NOT TARGET caf::openssl)
INTERFACE_LINK_LIBRARIES "OpenSSL::SSL") INTERFACE_LINK_LIBRARIES "OpenSSL::SSL")
endif () endif ()
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) if (CAF_test_FOUND AND NOT TARGET caf::test)
add_library(caf::test INTERFACE IMPORTED) add_library(caf::test INTERFACE IMPORTED)
set_target_properties(caf::test PROPERTIES set_target_properties(caf::test PROPERTIES
......
...@@ -82,7 +82,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]... ...@@ -82,7 +82,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--dev-mode sets --build-type=debug, --no-examples, --dev-mode sets --build-type=debug, --no-examples,
--no-tools, --with-runtime-checks, --no-tools, --with-runtime-checks,
--log-level=trace, and --log-level=trace, and
--sanitizers=address,undefined --with-sanitizers=address,undefined
Influential Environment Variables (only on first invocation): Influential Environment Variables (only on first invocation):
CXX C++ compiler command CXX C++ compiler command
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment