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
77e73ad4
Unverified
Commit
77e73ad4
authored
Feb 02, 2020
by
Dominik Charousset
Committed by
GitHub
Feb 02, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1037
Remove doc target an properly handle OPENSSL_INCLUDE_DIR in submodule mode
parents
40c788a3
a81a4d54
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
22 deletions
+17
-22
CMakeLists.txt
CMakeLists.txt
+15
-19
libcaf_core/caf/detail/parser/read_uri.hpp
libcaf_core/caf/detail/parser/read_uri.hpp
+2
-3
No files found.
CMakeLists.txt
View file @
77e73ad4
...
...
@@ -574,7 +574,12 @@ add_optional_caf_lib(io)
# build SSL module if OpenSSL library is available or if a parent project
# defined OPENSSL_LIBRARIES for us
if
(
DEFINED OPENSSL_LIBRARIES
)
if
(
NOT OPENSSL_INCLUDE_DIR
)
message
(
FATAL_ERROR
"got OPENSSL_LIBRARIES predefined but no OPENSSL_INCLUDE_DIR"
)
endif
()
message
(
STATUS
"use OPENSSL_LIBRARIES provided by parent:
${
OPENSSL_LIBRARIES
}
"
)
message
(
STATUS
"use OPENSSL_INCLUDE_DIR provided by parent:
${
OPENSSL_INCLUDE_DIR
}
"
)
include_directories
(
BEFORE
${
OPENSSL_INCLUDE_DIR
}
)
add_optional_caf_lib
(
openssl
)
elseif
(
NOT CAF_NO_OPENSSL
)
find_package
(
OpenSSL
)
...
...
@@ -682,27 +687,18 @@ if(NOT CAF_NO_UNIT_TESTS)
endif
()
# -- Fetch branch name and SHA if available ------------------------------------
if
(
EXISTS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/release.txt"
)
file
(
READ
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/release.txt"
CAF_RELEASE
)
string
(
REGEX REPLACE
"
\n
"
""
CAF_RELEASE
"
${
CAF_RELEASE
}
"
)
else
()
set
(
CAF_RELEASE
"
${
CAF_VERSION
}
"
)
endif
()
message
(
STATUS
"Set release version for all documentation to
${
CAF_RELEASE
}
."
)
# -- Setup for building manual and API documentation ---------------------------
add_subdirectory
(
doc
)
################################################################################
# Add additional project files to GUI #
################################################################################
file
(
GLOB_RECURSE script_files
"scripts/*"
)
add_custom_target
(
gui_dummy SOURCES configure
${
script_files
}
)
if
(
NOT caf_is_subproject
)
if
(
EXISTS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/release.txt"
)
file
(
READ
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/release.txt"
CAF_RELEASE
)
string
(
REGEX REPLACE
"
\n
"
""
CAF_RELEASE
"
${
CAF_RELEASE
}
"
)
else
()
set
(
CAF_RELEASE
"
${
CAF_VERSION
}
"
)
endif
()
message
(
STATUS
"Set release version for all documentation to
${
CAF_RELEASE
}
."
)
add_subdirectory
(
doc
)
endif
()
# -- Export important variables to the parent scope ----------------------------
...
...
libcaf_core/caf/detail/parser/read_uri.hpp
View file @
77e73ad4
...
...
@@ -130,9 +130,8 @@ void read_uri(State& ps, Consumer&& consumer) {
return
res
;
};
// Allowed character sets.
auto
path_char
=
[](
char
c
)
{
return
uri_unprotected_char
(
c
)
||
c
==
'/'
||
c
==
':'
;
};
auto
path_char
=
[](
char
c
)
{
return
uri_unprotected_char
(
c
)
||
c
==
'/'
||
c
==
':'
;
};
// Utility setters for avoiding code duplication.
auto
set_path
=
[
&
]
{
consumer
.
path
(
take_str
());
};
auto
set_host
=
[
&
]
{
consumer
.
host
(
take_str
());
};
...
...
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