From 4bf9b4db060b1dcd499c40fcba4edd0008d29679 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 21 Oct 2016 08:28:28 -0400 Subject: [libccd] Add libccd 2.0.0 (tip commit of current master) --- ports/libccd/CONTROL | 3 +++ ports/libccd/portfile.cmake | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 ports/libccd/CONTROL create mode 100644 ports/libccd/portfile.cmake (limited to 'ports/libccd') diff --git a/ports/libccd/CONTROL b/ports/libccd/CONTROL new file mode 100644 index 000000000..3a3a0252d --- /dev/null +++ b/ports/libccd/CONTROL @@ -0,0 +1,3 @@ +Source: libccd +Version: 2.0.0 +Description: Library for collision detection between two convex shapes diff --git a/ports/libccd/portfile.cmake b/ports/libccd/portfile.cmake new file mode 100644 index 000000000..8417689fd --- /dev/null +++ b/ports/libccd/portfile.cmake @@ -0,0 +1,33 @@ +# Common Ambient Variables: +# VCPKG_ROOT_DIR = +# TARGET_TRIPLET is the current triplet (x86-windows, etc) +# PORT is the current port name (zlib, etc) +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# + +include(${CMAKE_TRIPLET_FILE}) +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libccd-16b9379fb6e8610566fe5e1396166daf7106f165) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/danfis/libccd/archive/16b9379fb6e8610566fe5e1396166daf7106f165.zip" + FILENAME "libccd-16b9379fb6e8610566fe5e1396166daf7106f165.zip" + SHA512 6cb3ea713f1b1ac1bf48c9ee7e14cb85b3ec5c822ce239330913edc00cb84c846b49ec090cbfa226ef8de70bac97199eb2bf4c651225e3cfc6f6a9dd441aa7db +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 + # OPTIONS_RELEASE -DOPTIMIZE=1 + # OPTIONS_DEBUG -DDEBUGGABLE=1 +) + +vcpkg_install_cmake() + +# Avoid a copy of file in debug +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +# Handle copyright +file(COPY ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libccd) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libccd/BSD-LICENSE ${CURRENT_PACKAGES_DIR}/share/libccd/copyright) -- cgit v1.2.3 From b420f8ef46156b028f4aea39d0df520f715e236e Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Sat, 22 Oct 2016 20:34:19 -0700 Subject: [libccd] Remove debug/include/ and debug/share/ instead of debug/ --- ports/libccd/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ports/libccd') diff --git a/ports/libccd/portfile.cmake b/ports/libccd/portfile.cmake index 8417689fd..77ac87f04 100644 --- a/ports/libccd/portfile.cmake +++ b/ports/libccd/portfile.cmake @@ -26,7 +26,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Avoid a copy of file in debug -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(COPY ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libccd) -- cgit v1.2.3 From 23e1fa80ae3604fc77924e21c0258ed6dc02d9b7 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Sat, 22 Oct 2016 20:35:20 -0700 Subject: [libccd] copy_pdbs() --- ports/libccd/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ports/libccd') diff --git a/ports/libccd/portfile.cmake b/ports/libccd/portfile.cmake index 77ac87f04..34a7e31d6 100644 --- a/ports/libccd/portfile.cmake +++ b/ports/libccd/portfile.cmake @@ -25,6 +25,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_copy_pdbs() +endif() + # Avoid a copy of file in debug file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -- cgit v1.2.3 From 2c43f32f18ee073aa735ae2344e6a8b4d2f605da Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Sat, 22 Oct 2016 20:43:13 -0700 Subject: [libccd] Handle copyright cleanly --- ports/libccd/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ports/libccd') diff --git a/ports/libccd/portfile.cmake b/ports/libccd/portfile.cmake index 34a7e31d6..74b250c4e 100644 --- a/ports/libccd/portfile.cmake +++ b/ports/libccd/portfile.cmake @@ -34,5 +34,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(COPY ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libccd) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libccd/BSD-LICENSE ${CURRENT_PACKAGES_DIR}/share/libccd/copyright) +file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libccd RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) -- cgit v1.2.3 From 91be9db1210fec892eeef176ff6035a6b574386a Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Sat, 22 Oct 2016 20:44:55 -0700 Subject: [libccd] Remove other misc files that are getting copied --- ports/libccd/portfile.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ports/libccd') diff --git a/ports/libccd/portfile.cmake b/ports/libccd/portfile.cmake index 74b250c4e..5b99d6c42 100644 --- a/ports/libccd/portfile.cmake +++ b/ports/libccd/portfile.cmake @@ -36,3 +36,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libccd RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) + +# Miscellaneous cleanup +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/ccd) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/ccd) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) \ No newline at end of file -- cgit v1.2.3 From 71594b6bef76b3510265cf508b24d9221ceede4b Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 31 Oct 2016 12:34:04 -0700 Subject: Remove portfile branching of vcpkg_copy_pdbs() --- ports/libccd/portfile.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'ports/libccd') diff --git a/ports/libccd/portfile.cmake b/ports/libccd/portfile.cmake index 5b99d6c42..67eda1ccb 100644 --- a/ports/libccd/portfile.cmake +++ b/ports/libccd/portfile.cmake @@ -25,10 +25,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_copy_pdbs() -endif() - # Avoid a copy of file in debug file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) @@ -41,4 +37,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/ccd) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/ccd) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) \ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + +vcpkg_copy_pdbs() \ No newline at end of file -- cgit v1.2.3 From 1808d461b0e8793445b87eb8ceed71d5ac7aca6e Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 8 Nov 2016 14:25:47 -0800 Subject: triplet is now automatically included before portfiles. Also remove trailing whitespaces from portfiles --- ports/libccd/portfile.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'ports/libccd') diff --git a/ports/libccd/portfile.cmake b/ports/libccd/portfile.cmake index 67eda1ccb..963000ec5 100644 --- a/ports/libccd/portfile.cmake +++ b/ports/libccd/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libccd-16b9379fb6e8610566fe5e1396166daf7106f165) vcpkg_download_distfile(ARCHIVE -- cgit v1.2.3