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
f085334d
Commit
f085334d
authored
Mar 26, 2020
by
Dominik Charousset
Committed by
Dominik Charousset
Mar 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Print found version on OpenSSL version mismatch
(cherry picked from commit
1f12fc68
)
parent
fd1e6b32
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
11 deletions
+25
-11
CMakeLists.txt
CMakeLists.txt
+11
-11
cmake/openssl-check.cpp
cmake/openssl-check.cpp
+14
-0
No files found.
CMakeLists.txt
View file @
f085334d
...
@@ -477,18 +477,18 @@ if(NOT CAF_NO_OPENSSL)
...
@@ -477,18 +477,18 @@ if(NOT CAF_NO_OPENSSL)
else
()
else
()
if
(
NOT CMAKE_CROSSCOMPILING
)
if
(
NOT CMAKE_CROSSCOMPILING
)
# Check if openssl headers and library versions match
# Check if openssl headers and library versions match
set
(
CMAKE_REQUIRED_LIBRARIES
${
OPENSSL_LIBRARIES
}
)
try_run
(
sslRunResult sslCompileResult
set
(
CMAKE_REQUIRED_INCLUDES
${
OPENSSL_INCLUDE_DIR
}
)
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
check_cxx_source_runs
(
"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/openssl-check.cpp
"
#include <openssl/opensslv.h>
CMAKE_FLAGS
"-DINCLUDE_DIRECTORIES=
${
OPENSSL_INCLUDE_DIR
}
"
#include <openssl/crypto.h>
LINK_LIBRARIES
${
OPENSSL_LIBRARIES
}
int main() {
OUTPUT_VARIABLE sslOutput
)
return SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1;
if
(
NOT sslCompileResult
)
}
message
(
FATAL_ERROR
"failed to compile/link against OpenSSL"
)
"
OPENSSL_CORRECT_VERSION_NUMBER
)
endif
(
)
if
(
NOT OPENSSL_CORRECT_VERSION_NUMBER
)
if
(
NOT sslRunResult EQUAL 0
)
message
(
FATAL_ERROR
message
(
FATAL_ERROR
"OpenSSL library version does not match headers
"
)
"OpenSSL version does not match headers:
${
sslOutput
}
"
)
endif
()
endif
()
endif
()
endif
()
include_directories
(
BEFORE
${
OPENSSL_INCLUDE_DIR
}
)
include_directories
(
BEFORE
${
OPENSSL_INCLUDE_DIR
}
)
...
...
cmake/openssl-check.cpp
0 → 100644
View file @
f085334d
#include <openssl/crypto.h>
#include <openssl/opensslv.h>
#include <cstdio>
#include <cstdlib>
int
main
()
{
long
have
=
SSLeay
();
long
want
=
OPENSSL_VERSION_NUMBER
;
printf
(
"have OpenSSL %lx, want %lx
\n
"
,
have
,
want
);
if
(
have
==
want
)
return
EXIT_SUCCESS
;
return
EXIT_FAILURE
;
}
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