diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-11-30 09:36:36 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-11-30 09:37:54 (GMT) |
| commit | cebe9e985075912e45bb385fbb6a1505838036da (patch) | |
| tree | 256f4e31374bdca6fb65a13d18f2eecf3841309f /src/cpp-netlib-1-fixes.patch | |
| parent | 17c583f6651cab67d658c76cee15d911587d2b77 (diff) | |
| download | mxe-cebe9e985075912e45bb385fbb6a1505838036da.zip mxe-cebe9e985075912e45bb385fbb6a1505838036da.tar.gz mxe-cebe9e985075912e45bb385fbb6a1505838036da.tar.bz2 | |
cpp-netlib: enable openssl, fix ws2_32 linking, dll and *.cmake install
Diffstat (limited to 'src/cpp-netlib-1-fixes.patch')
| -rw-r--r-- | src/cpp-netlib-1-fixes.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/src/cpp-netlib-1-fixes.patch b/src/cpp-netlib-1-fixes.patch new file mode 100644 index 0000000..67dc72f --- /dev/null +++ b/src/cpp-netlib-1-fixes.patch @@ -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) + |