Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
2bf9602e
There was an error fetching the commit references. Please try again later.
Commit
2bf9602e
authored
2 years ago
by
Alexandre Bouvier
Browse files
Options
Downloads
Patches
Plain Diff
cmake: fix cpp-jwt build
parent
11f6bb15
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-0
3 additions, 0 deletions
CMakeLists.txt
externals/CMakeLists.txt
+8
-10
8 additions, 10 deletions
externals/CMakeLists.txt
with
11 additions
and
10 deletions
CMakeLists.txt
+
3
−
0
View file @
2bf9602e
...
...
@@ -242,6 +242,9 @@ endif()
if
(
ENABLE_WEB_SERVICE
)
find_package
(
cpp-jwt 1.4 CONFIG
)
find_package
(
httplib 0.12 MODULE
)
if
(
NOT cpp-jwt_FOUND OR NOT httplib_FOUND
)
find_package
(
OpenSSL 1.1 MODULE COMPONENTS Crypto SSL
)
endif
()
endif
()
if
(
YUZU_TESTS
)
...
...
This diff is collapsed.
Click to expand it.
externals/CMakeLists.txt
+
8
−
10
View file @
2bf9602e
...
...
@@ -100,17 +100,9 @@ endif()
# Sirit
add_subdirectory
(
sirit EXCLUDE_FROM_ALL
)
# httplib
if
(
ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib
)
if
(
NOT WIN32
)
find_package
(
OpenSSL 1.1
)
if
(
OPENSSL_FOUND
)
set
(
OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto
)
endif
()
endif
()
# LibreSSL
if
(
ENABLE_WEB_SERVICE AND DEFINED OPENSSL_FOUND
)
if
(
WIN32 OR NOT OPENSSL_FOUND
)
# LibreSSL
set
(
LIBRESSL_SKIP_INSTALL ON
)
set
(
OPENSSLDIR
"/etc/ssl/"
)
add_subdirectory
(
libressl EXCLUDE_FROM_ALL
)
...
...
@@ -119,8 +111,13 @@ if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib)
get_directory_property
(
OPENSSL_LIBRARIES
DIRECTORY libressl
DEFINITION OPENSSL_LIBS
)
else
()
set
(
OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto
)
endif
()
endif
()
# httplib
if
(
ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib
)
add_library
(
httplib INTERFACE
)
target_include_directories
(
httplib INTERFACE ./cpp-httplib
)
target_compile_definitions
(
httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT
)
...
...
@@ -136,6 +133,7 @@ if (ENABLE_WEB_SERVICE AND NOT TARGET cpp-jwt::cpp-jwt)
add_library
(
cpp-jwt INTERFACE
)
target_include_directories
(
cpp-jwt INTERFACE ./cpp-jwt/include
)
target_compile_definitions
(
cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON
)
target_link_libraries
(
cpp-jwt INTERFACE
${
OPENSSL_LIBRARIES
}
)
add_library
(
cpp-jwt::cpp-jwt ALIAS cpp-jwt
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment