fix curlpp and dynamic builds on linux

cenit · Sep 25, 2019 · 7358190 · 7358190
1 parent c389542
commit 7358190
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 37 deletions.
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
@@ -175,6 +175,16 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 else()
     file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/curl-config ${CURRENT_PACKAGES_DIR}/debug/bin/curl-config)
+
+    file(GLOB FILES LIST_DIRECTORIES TRUE ${CURRENT_PACKAGES_DIR}/bin/*)
+    if (FILES STREQUAL "")
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+    endif()
+
+    file(GLOB FILES LIST_DIRECTORIES TRUE ${CURRENT_PACKAGES_DIR}/debug/bin/*)
+    if (FILES STREQUAL "")
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+    endif()
 endif()
 
 file(READ ${CURRENT_PACKAGES_DIR}/include/curl/curl.h CURL_H)

diff --git a/ports/curl/vcpkg-cmake-wrapper.cmake b/ports/curl/vcpkg-cmake-wrapper.cmake
@@ -23,11 +23,17 @@ if(TARGET CURL::libcurl)
     if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
         get_target_property(_curl_location_debug CURL::libcurl IMPORTED_IMPLIB_DEBUG)
         get_target_property(_curl_location_release CURL::libcurl IMPORTED_IMPLIB_RELEASE)
-    else()
+    endif()
+
+    if(NOT _curl_location_debug AND NOT _curl_location_release)
         get_target_property(_curl_location_debug CURL::libcurl IMPORTED_LOCATION_DEBUG)
         get_target_property(_curl_location_release CURL::libcurl IMPORTED_LOCATION_RELEASE)
     endif()
 
+    if(NOT _curl_link_libraries)
+        set(_curl_link_libraries)
+    endif()
+
     set(CURL_INCLUDE_DIRS "${_curl_include_dirs}")
     set(CURL_LIBRARY_DEBUG "${_curl_location_debug}")
     set(CURL_LIBRARY_RELEASE "${_curl_location_release}")
@@ -38,4 +44,9 @@ if(TARGET CURL::libcurl)
 
     set(CURL_LIBRARIES ${CURL_LIBRARY} ${_curl_link_libraries})
     set(CURL_VERSION_STRING "${CURL_VERSION}")
+
+    set(_curl_include_dirs)
+    set(_curl_link_libraries)
+    set(_curl_location_debug)
+    set(_curl_location_release)
 endif()
diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake
@@ -31,7 +31,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     )
 
     configure_file(
-        ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
         ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}
         @ONLY
     )

diff --git a/ports/curlpp/vcpkg-cmake-wrapper.cmake b/ports/curlpp/vcpkg-cmake-wrapper.cmake
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@
         )
         configure_file(
-            ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
             ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}
             @ONLY
         )
@@ Expand Down @@