Skip to content
Snippets Groups Projects
Commit a4a68c4f authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

SL-18837: We no longer build Windows apr-iconv -- don't reference.

With VS 2022 on Windows GitHub Actions runners, we can't build apr_suite at
all with the upstream .sln / .vcxproj files, so we had to switch to
"experimental" CMake support. However there's no CMakeLists.txt file for
apr-iconv, so the Windows package omits that library.
parent 42c69448
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -16,7 +16,6 @@ if (WINDOWS) ...@@ -16,7 +16,6 @@ if (WINDOWS)
endif (LLCOMMON_LINK_SHARED) endif (LLCOMMON_LINK_SHARED)
target_link_libraries( ll::apr INTERFACE target_link_libraries( ll::apr INTERFACE
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib
) )
elseif (DARWIN) elseif (DARWIN)
...@@ -37,7 +36,6 @@ else (WINDOWS) ...@@ -37,7 +36,6 @@ else (WINDOWS)
target_link_libraries( ll::apr INTERFACE target_link_libraries( ll::apr INTERFACE
apr-1 apr-1
aprutil-1 aprutil-1
iconv
uuid uuid
rt rt
) )
......
...@@ -57,7 +57,6 @@ if(WINDOWS) ...@@ -57,7 +57,6 @@ if(WINDOWS)
openjp2.dll openjp2.dll
libapr-1.dll libapr-1.dll
libaprutil-1.dll libaprutil-1.dll
libapriconv-1.dll
nghttp2.dll nghttp2.dll
libhunspell.dll libhunspell.dll
uriparser.dll uriparser.dll
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment