try to actually set LIBRARIES

cenit · Sep 25, 2019 · 9030807 · 9030807
1 parent f84ed44
commit 9030807
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/ports/curl/vcpkg-cmake-wrapper.cmake b/ports/curl/vcpkg-cmake-wrapper.cmake
@@ -17,9 +17,18 @@ endif()
 if(TARGET CURL::libcurl)
     set(CURL_FOUND TRUE)
     get_target_property(_curl_include_dirs CURL::libcurl INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property(_curl_location_debug CURL::libcurl IMPORTED_LOCATION_DEBUG)
+    get_target_property(_curl_location_release CURL::libcurl IMPORTED_LOCATION_RELEASE)
+    get_target_property(_curl_link_libraries CURL::libcurl INTERFACE_LINK_LIBRARIES)
+
     set(CURL_INCLUDE_DIRS "${_curl_include_dirs}")
-    #for netcdf-c
-    set(CURL_LIBRARY CURL::libcurl)
-    set(CURL_LIBRARIES CURL::libcurl)
+    set(CURL_LIBRARY_DEBUG "${_curl_location_debug}")
+    set(CURL_LIBRARY_RELEASE "${_curl_location_release}")
+
+    #For libraries which rely on CURL_LIBRAR(Y/IES)
+    include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
+    select_library_configurations(CURL)
+
+    set(CURL_LIBRARIES "${_curl_link_libraries}" "${CURL_LIBRARY}")
     set(CURL_VERSION_STRING "${CURL_VERSION}")
 endif()
diff --git a/ports/netcdf-c/0001_import_curl_target.patch b/ports/netcdf-c/0001_import_curl_target.patch
diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake
@@ -14,7 +14,6 @@ vcpkg_from_github(
         hdf5_2.patch
         fix-build-error-on-linux.patch
         hdf5_3.patch
-        0001_import_curl_target.patch
 )
 
 #Remove outdated find modules