vcpkg/ports/log4cxx/linux.patch
Stephen Webb 41ec19fa8a
[log4cxx] Upgrade to 0.11.0 (#13767)
* [log4cxx] Upgrade to newly released 0.11.0

* [log4cxx] 0.11.0 should build everywhere except uwp

* Changes suggested by @ras0219

* Prevent WIN32 libraries being used on linux

* Prevent WIN32 libraries being used on linux

* Prevent WIN32 libraries being used on linux

* Update ports/log4cxx/portfile.cmake

Co-authored-by: Stephen Webb <stephen.webb@sabreautonomous.com.au>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-10-06 15:00:58 -07:00

18 lines
627 B
Diff

diff --git a/src/cmake/FindAPR.cmake b/src/cmake/FindAPR.cmake
index a204ece..4d2b48d 100644
--- a/src/cmake/FindAPR.cmake
+++ b/src/cmake/FindAPR.cmake
@@ -45,7 +45,11 @@ if(EXISTS ${APR_CONFIG_EXECUTABLE})
else()
find_path(APR_INCLUDE_DIR apr.h PATH_SUFFIXES apr-1)
if (APR_STATIC OR NOT BUILD_SHARED_LIBS)
- set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4)
+ if(WIN32)
+ set(APR_SYSTEM_LIBS ws2_32 mswsock rpcrt4)
+ else()
+ set(APR_SYSTEM_LIBS pthread)
+ endif()
set(APR_COMPILE_DEFINITIONS APR_DECLARE_STATIC)
find_library(APR_LIBRARIES NAMES apr-1)
else()