Showing the changes to src/cpp-netlib-1-fixes.patch (1 of 2 files). Show all
Unified · Split
| @@ -0,0 +1,47 @@ | |||
| 1 | This file is part of MXE. | ||
| 2 | See index.html for further information. | ||
| 3 | |||
| 4 | Contains ad hoc patches for cross building. | ||
| 5 | |||
| 6 | From 12d808cb5f167015b193f3a7f61f4414f93e3876 Mon Sep 17 00:00:00 2001 | ||
| 7 | From: MXE | ||
| 8 | Date: Mon, 30 Nov 2015 20:34:28 +1100 | ||
| 9 | Subject: [PATCH] fix dll installation and ws2_32 linking errors | ||
| 10 | |||
| 11 | |||
| 12 | diff --git a/libs/network/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt | ||
| 13 | index 3f22165..baa70e4 100644 | ||
| 14 | --- a/libs/network/src/CMakeLists.txt | ||
| 15 | +++ b/libs/network/src/CMakeLists.txt | ||
| 16 | @@ -21,6 +21,7 @@ install(TARGETS cppnetlib-uri | ||
| 17 | EXPORT cppnetlibTargets | ||
| 18 | PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} | ||
| 19 | LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} | ||
| 20 | + RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} | ||
| 21 | ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) | ||
| 22 | |||
| 23 | set(CPP-NETLIB_HTTP_SERVER_SRCS server_request_parsers_impl.cpp) | ||
| 24 | @@ -33,6 +34,7 @@ install(TARGETS cppnetlib-server-parsers | ||
| 25 | EXPORT cppnetlibTargets | ||
| 26 | PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} | ||
| 27 | LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} | ||
| 28 | + RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} | ||
| 29 | ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) | ||
| 30 | |||
| 31 | set(CPP-NETLIB_HTTP_CLIENT_SRCS client.cpp) | ||
| 32 | @@ -47,8 +49,12 @@ endif () | ||
| 33 | if (Boost_FOUND) | ||
| 34 | target_link_libraries(cppnetlib-client-connections ${Boost_LIBRARIES}) | ||
| 35 | endif () | ||
| 36 | +if (WIN32) | ||
| 37 | + target_link_libraries(cppnetlib-client-connections ws2_32) | ||
| 38 | +endif () | ||
| 39 | install(TARGETS cppnetlib-client-connections | ||
| 40 | EXPORT cppnetlibTargets | ||
| 41 | PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} | ||
| 42 | LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} | ||
| 43 | + RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} | ||
| 44 | ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) | ||
| 45 | -- | ||
| 46 | 2.4.9 (Apple Git-60) | ||
| 47 | |||