Unverified Commit 8a1f6023 authored by Dennis Jenkins's avatar Dennis Jenkins Committed by GitHub

Merge pull request #671 from neobrain/master

Fix Android build
parents 87953d3a e37044fc
...@@ -57,10 +57,10 @@ if(${CMAKE_VERSION} VERSION_LESS "3.8.0") ...@@ -57,10 +57,10 @@ if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
endif() endif()
else() 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. # This gives an error on date.h external library.
# Following workaround forces Clang to compile at best with C++14 # Following workaround forces Clang <= 6 to compile at best with C++14
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0.0))
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
elseif (CMAKE_COMPILER_IS_GNUCC) elseif (CMAKE_COMPILER_IS_GNUCC)
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
...@@ -76,6 +76,9 @@ endif() ...@@ -76,6 +76,9 @@ endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
if (PISTACHE_USE_SSL) if (PISTACHE_USE_SSL)
add_definitions(-DPISTACHE_USE_SSL) add_definitions(-DPISTACHE_USE_SSL)
link_libraries(-lssl -lcrypto) link_libraries(-lssl -lcrypto)
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <stdexcept> #include <stdexcept>
#include <limits> #include <limits>
#include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
......
...@@ -26,8 +26,8 @@ set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) ...@@ -26,8 +26,8 @@ set(bin_install_dir ${CMAKE_INSTALL_BINDIR})
add_library(pistache_shared SHARED $<TARGET_OBJECTS:pistache>) add_library(pistache_shared SHARED $<TARGET_OBJECTS:pistache>)
add_library(pistache_static STATIC $<TARGET_OBJECTS:pistache>) add_library(pistache_static STATIC $<TARGET_OBJECTS:pistache>)
target_link_libraries(pistache_shared pthread) target_link_libraries(pistache_shared Threads::Threads)
target_link_libraries(pistache_static pthread) target_link_libraries(pistache_static Threads::Threads)
set(Pistache_OUTPUT_NAME "pistache") set(Pistache_OUTPUT_NAME "pistache")
set_target_properties(pistache_shared PROPERTIES set_target_properties(pistache_shared PROPERTIES
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment