aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTsukasa Sugiura <t.sugiura0204@gmail.com>2017-11-26 07:34:19 +0900
committerTsukasa Sugiura <t.sugiura0204@gmail.com>2017-11-26 07:36:03 +0900
commit173a1d59a590f823cd0e25b48906348ff68435e2 (patch)
treef8c619dc7302001c3bd64655200b313c5e0d3267
parentfda988964d2f84aae705802092315ba83ada76a7 (diff)
downloadvcpkg-173a1d59a590f823cd0e25b48906348ff68435e2.tar.gz
vcpkg-173a1d59a590f823cd0e25b48906348ff68435e2.zip
Fix remove files when install dynamic libraries
Fix remove files when install dynamic libraries.
-rw-r--r--ports/qhull/CONTROL2
-rw-r--r--ports/qhull/portfile.cmake4
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/qhull/CONTROL b/ports/qhull/CONTROL
index ff0847781..8eb3f8772 100644
--- a/ports/qhull/CONTROL
+++ b/ports/qhull/CONTROL
@@ -1,3 +1,3 @@
Source: qhull
-Version: 2015.2-1
+Version: 2015.2-2
Description: computes the convex hull, Delaunay triangulation, Voronoi diagram
diff --git a/ports/qhull/portfile.cmake b/ports/qhull/portfile.cmake
index ab4ea3b92..25ee8f0d1 100644
--- a/ports/qhull/portfile.cmake
+++ b/ports/qhull/portfile.cmake
@@ -39,6 +39,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_d.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull_p.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_pd.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull_r.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_rd.lib)
+else()
+ file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhullcpp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhullcpp_d.lib)
+ file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhullstatic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhullstatic_d.lib)
+ file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhullstatic_r.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhullstatic_rd.lib)
endif()
file(COPY ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/qhull)