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
f91d7868
Commit
f91d7868
authored
Apr 13, 2020
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix include directories and prefer -pthread flag
parent
cfdefa82
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
10 deletions
+12
-10
CMakeLists.txt
CMakeLists.txt
+2
-1
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+3
-5
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+3
-1
libcaf_openssl/CMakeLists.txt
libcaf_openssl/CMakeLists.txt
+4
-3
No files found.
CMakeLists.txt
View file @
f91d7868
cmake_minimum_required
(
VERSION 3.
0
FATAL_ERROR
)
cmake_minimum_required
(
VERSION 3.
2.3
FATAL_ERROR
)
project
(
CAF CXX
)
project
(
CAF CXX
)
# -- includes ------------------------------------------------------------------
# -- includes ------------------------------------------------------------------
...
@@ -12,6 +12,7 @@ include(GenerateExportHeader) # Auto-generates dllexport macros
...
@@ -12,6 +12,7 @@ include(GenerateExportHeader) # Auto-generates dllexport macros
option
(
BUILD_SHARED_LIBS
"Shared library targets"
ON
)
option
(
BUILD_SHARED_LIBS
"Shared library targets"
ON
)
option
(
CMAKE_EXPORT_COMPILE_COMMANDS
"JSON compile commands database"
ON
)
option
(
CMAKE_EXPORT_COMPILE_COMMANDS
"JSON compile commands database"
ON
)
option
(
THREADS_PREFER_PTHREAD_FLAG
"Prefer -pthread flag if available "
ON
)
# -- CAF options that are off by default ----------------------------------------
# -- CAF options that are off by default ----------------------------------------
...
...
libcaf_core/CMakeLists.txt
View file @
f91d7868
...
@@ -227,11 +227,6 @@ add_executable(caf-core-test
...
@@ -227,11 +227,6 @@ add_executable(caf-core-test
test/core-test.cpp
test/core-test.cpp
$<TARGET_OBJECTS:libcaf_core_obj>
)
$<TARGET_OBJECTS:libcaf_core_obj>
)
if
(
CAF_SANITIZERS
)
target_link_libraries
(
caf-core-test PRIVATE -fsanitize=
${
CAF_SANITIZERS
}
)
endif
()
target_include_directories
(
caf-core-test PRIVATE
target_include_directories
(
caf-core-test PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/test"
)
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/test"
)
...
@@ -239,6 +234,9 @@ target_compile_definitions(caf-core-test PRIVATE libcaf_core_EXPORTS)
...
@@ -239,6 +234,9 @@ target_compile_definitions(caf-core-test PRIVATE libcaf_core_EXPORTS)
target_link_libraries
(
caf-core-test PUBLIC CAF::test
)
target_link_libraries
(
caf-core-test PUBLIC CAF::test
)
target_link_libraries
(
caf-core-test PRIVATE
$<TARGET_PROPERTY:CAF::core,INTERFACE_LINK_LIBRARIES>
)
target_include_directories
(
caf-core-test PRIVATE
target_include_directories
(
caf-core-test PRIVATE
"
${
CMAKE_BINARY_DIR
}
"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
"
${
CMAKE_BINARY_DIR
}
"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
...
...
libcaf_io/CMakeLists.txt
View file @
f91d7868
...
@@ -72,7 +72,9 @@ if(BUILD_SHARED_LIBS AND NOT WIN32)
...
@@ -72,7 +72,9 @@ if(BUILD_SHARED_LIBS AND NOT WIN32)
target_compile_options
(
libcaf_io_obj PRIVATE -fPIC
)
target_compile_options
(
libcaf_io_obj PRIVATE -fPIC
)
endif
()
endif
()
target_link_libraries
(
libcaf_io_obj PRIVATE CAF::core
)
target_include_directories
(
libcaf_io_obj PRIVATE
$<TARGET_PROPERTY:libcaf_core,INTERFACE_INCLUDE_DIRECTORIES>
)
target_link_libraries
(
libcaf_io PUBLIC CAF::core
)
target_link_libraries
(
libcaf_io PUBLIC CAF::core
)
if
(
MSVC
)
if
(
MSVC
)
...
...
libcaf_openssl/CMakeLists.txt
View file @
f91d7868
...
@@ -33,9 +33,10 @@ if(NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto)
...
@@ -33,9 +33,10 @@ if(NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto)
find_package
(
OpenSSL REQUIRED
)
find_package
(
OpenSSL REQUIRED
)
endif
()
endif
()
target_link_libraries
(
libcaf_openssl_obj PUBLIC
target_include_directories
(
libcaf_openssl_obj PRIVATE
CAF::core CAF::io
$<TARGET_PROPERTY:libcaf_core,INTERFACE_INCLUDE_DIRECTORIES>
OpenSSL::SSL OpenSSL::Crypto
)
$<TARGET_PROPERTY:libcaf_io,INTERFACE_INCLUDE_DIRECTORIES>
${
OPENSSL_INCLUDE_DIR
}
)
target_link_libraries
(
libcaf_openssl PUBLIC
target_link_libraries
(
libcaf_openssl PUBLIC
CAF::core CAF::io
CAF::core CAF::io
...
...
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