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
882ba63d
Unverified
Commit
882ba63d
authored
Apr 27, 2018
by
Dominik Charousset
Committed by
GitHub
Apr 27, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #687
Improve cross compilation support
parents
6a846488
7f11b878
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
16 deletions
+18
-16
CMakeLists.txt
CMakeLists.txt
+18
-16
No files found.
CMakeLists.txt
View file @
882ba63d
...
...
@@ -183,7 +183,7 @@ endif()
################################################################################
# check for g++ >= 4.8 or clang++ > = 3.2
if
(
NOT WIN32 AND NOT CAF_NO_COMPILER_CHECK
)
if
(
NOT WIN32 AND NOT CAF_NO_COMPILER_CHECK
AND NOT CMAKE_CROSSCOMPILING
)
try_run
(
ProgramResult
CompilationSucceeded
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
...
...
@@ -547,6 +547,7 @@ if(NOT CAF_NO_OPENSSL)
"Disable OpenSSL. Required >= 1.0.1 due to TLSv1.2 support."
)
set
(
CAF_NO_OPENSSL yes
)
else
()
if
(
NOT CMAKE_CROSSCOMPILING
)
# Check if openssl headers and library versions match
set
(
CMAKE_REQUIRED_LIBRARIES
${
OPENSSL_LIBRARIES
}
)
set
(
CMAKE_REQUIRED_INCLUDES
${
OPENSSL_INCLUDE_DIR
}
)
...
...
@@ -564,6 +565,7 @@ if(NOT CAF_NO_OPENSSL)
message
(
FATAL_ERROR
"OpenSSL library version does not match headers"
)
endif
()
endif
()
include_directories
(
BEFORE
${
OPENSSL_INCLUDE_DIR
}
)
add_optional_caf_lib
(
openssl
)
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