Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
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
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
Libraries
pistache
Commits
8a1f6023
Unverified
Commit
8a1f6023
authored
Jan 17, 2020
by
Dennis Jenkins
Committed by
GitHub
Jan 17, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #671 from neobrain/master
Fix Android build
parents
87953d3a
e37044fc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
CMakeLists.txt
CMakeLists.txt
+6
-3
include/pistache/net.h
include/pistache/net.h
+1
-0
src/CMakeLists.txt
src/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
8a1f6023
...
...
@@ -57,10 +57,10 @@ if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
set
(
CMAKE_CXX_STANDARD 14
)
endif
()
else
()
#
Clang exports
C++17 in std::experimental namespace (tested on Clang 5 and 6).
#
Old versions of Clang export
C++17 in std::experimental namespace (tested on Clang 5 and 6).
# This gives an error on date.h external library.
# Following workaround forces Clang to compile at best with C++14
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
)
# Following workaround forces Clang
<= 6
to compile at best with C++14
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
AND
NOT
(
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0.0
)
)
set
(
CMAKE_CXX_STANDARD 14
)
elseif
(
CMAKE_COMPILER_IS_GNUCC
)
if
(
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0
)
...
...
@@ -76,6 +76,9 @@ endif()
set
(
CMAKE_CXX_STANDARD_REQUIRED ON
)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
set
(
THREADS_PREFER_PTHREAD_FLAG ON
)
find_package
(
Threads REQUIRED
)
if
(
PISTACHE_USE_SSL
)
add_definitions
(
-DPISTACHE_USE_SSL
)
link_libraries
(
-lssl -lcrypto
)
...
...
include/pistache/net.h
View file @
8a1f6023
...
...
@@ -11,6 +11,7 @@
#include <stdexcept>
#include <limits>
#include <netinet/in.h>
#include <sys/socket.h>
#include <netdb.h>
...
...
src/CMakeLists.txt
View file @
8a1f6023
...
...
@@ -26,8 +26,8 @@ set(bin_install_dir ${CMAKE_INSTALL_BINDIR})
add_library
(
pistache_shared SHARED $<TARGET_OBJECTS:pistache>
)
add_library
(
pistache_static STATIC $<TARGET_OBJECTS:pistache>
)
target_link_libraries
(
pistache_shared
pthread
)
target_link_libraries
(
pistache_static
pthread
)
target_link_libraries
(
pistache_shared
Threads::Threads
)
target_link_libraries
(
pistache_static
Threads::Threads
)
set
(
Pistache_OUTPUT_NAME
"pistache"
)
set_target_properties
(
pistache_shared PROPERTIES
...
...
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