d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cpp-netlib: enable openssl, fix ws2_32 linking, dll and *.cmake install

This commit is contained in:
Tony Theodore 2015-11-30 20:36:36 +11:00
parent 17c583f665
commit cebe9e9850
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/cpp-netlib-1-fixes.patch Normal file
View File

@ -0,0 +1,47 @@
This file is part of MXE.
See index.html for further information.
Contains ad hoc patches for cross building.
From 12d808cb5f167015b193f3a7f61f4414f93e3876 Mon Sep 17 00:00:00 2001
From: MXE
Date: Mon, 30 Nov 2015 20:34:28 +1100
Subject: [PATCH] fix dll installation and ws2_32 linking errors
diff --git a/libs/network/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt
index 3f22165..baa70e4 100644
--- a/libs/network/src/CMakeLists.txt
+++ b/libs/network/src/CMakeLists.txt
@@ -21,6 +21,7 @@ install(TARGETS cppnetlib-uri
EXPORT cppnetlibTargets
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
set(CPP-NETLIB_HTTP_SERVER_SRCS server_request_parsers_impl.cpp)
@@ -33,6 +34,7 @@ install(TARGETS cppnetlib-server-parsers
EXPORT cppnetlibTargets
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
set(CPP-NETLIB_HTTP_CLIENT_SRCS client.cpp)
@@ -47,8 +49,12 @@ endif ()
if (Boost_FOUND)
target_link_libraries(cppnetlib-client-connections ${Boost_LIBRARIES})
endif ()
+if (WIN32)
+ target_link_libraries(cppnetlib-client-connections ws2_32)
+endif ()
install(TARGETS cppnetlib-client-connections
EXPORT cppnetlibTargets
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
--
2.4.9 (Apple Git-60)

3
src/cpp-netlib.mk
View File

@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 71953379c5a6fab618cbda9ac6639d87b35cab0600a4450a7392bc08c930f
$(PKG)_SUBDIR := cpp-netlib-$($(PKG)_VERSION)-final
$(PKG)_FILE := cpp-netlib-$($(PKG)_VERSION)-final.tar.gz
$(PKG)_URL := http://downloads.cpp-netlib.org/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc boost
$(PKG)_DEPS := gcc boost openssl
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://cpp-netlib.org/' | \
@ -21,6 +21,7 @@ define $(PKG)_BUILD
mkdir '$(1)/build'
cd '$(1)/build' && cmake .. \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DINSTALL_CMAKE_DIR='$(PREFIX)/$(TARGET)/cmake/$(PKG)' \
-DCPP-NETLIB_BUILD_EXAMPLES=OFF \
-DCPP-NETLIB_BUILD_TESTS=OFF