Skip to content

Commit abdc7bf

Browse files
committed
Remove vcpkg workaround from ProvideCurl.cmake
According to these links the issue should be fixed and the workaround no longer necessary: * microsoft/vcpkg#3220 * microsoft/vcpkg#1909
1 parent 805ebfb commit abdc7bf

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

mk/cmake/SuperTux/ProvideCurl.cmake

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,6 @@
44
if(NOT EMSCRIPTEN)
55
find_package(CURL REQUIRED)
66

7-
if(WIN32 AND VCPKG_BUILD)
8-
list(LENGTH CURL_LIBRARY CURL_LIBRARY_LENGTH)
9-
if(CURL_LIBRARY_LENGTH EQUAL 1)
10-
set(CURL_LIBRARY_DEBUG_LIB ${CURL_LIBRARY})
11-
set(CURL_LIBRARY_RELEASE_LIB ${CURL_LIBRARY_DEBUG_LIB}/../../../lib/libcurl.lib)
12-
get_filename_component(CURL_LIBRARY_RELEASE_LIB ${CURL_LIBRARY_RELEASE_LIB} REALPATH)
13-
unset(CURL_LIBRARY CACHE)
14-
unset(CURL_LIBRARY)
15-
unset(CURL_LIBRARIES CACHE)
16-
unset(CURL_LIBRARIES)
17-
set(CURL_LIBRARY "debug;${CURL_LIBRARY_DEBUG_LIB};optimized;${CURL_LIBRARY_RELEASE_LIB}")
18-
set(CURL_LIBRARIES ${CURL_LIBRARY})
19-
endif()
20-
endif()
21-
227
add_library(LibCurl INTERFACE IMPORTED)
238
set_target_properties(LibCurl PROPERTIES
249
INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}")

0 commit comments

Comments
 (0)