[Chipmunk] build via cmake (#14776)

3 files changed, 23 insertions, 61 deletions

diff --git a/ports/chipmunk/CONTROL b/ports/chipmunk/CONTROL
index 7437c78d8..d5948caf7 100644
--- a/ports/chipmunk/CONTROL
+++ b/ports/chipmunk/CONTROL
@@ -1,4 +1,5 @@
 Source: chipmunk
 Version: 7.0.3
+Port-Version: 1
 Homepage: https://github.com/slembcke/Chipmunk2D
 Description: A fast and lightweight 2D game physics library.
\ No newline at end of file
diff --git a/ports/chipmunk/portfile.cmake b/ports/chipmunk/portfile.cmake
index 5b148640f..f0f72cd6c 100644
--- a/ports/chipmunk/portfile.cmake
+++ b/ports/chipmunk/portfile.cmake
@@ -1,23 +1,3 @@
-#architecture detection
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-   set(CHIPMUNK_ARCH Win32)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-   set(CHIPMUNK_ARCH x64)
-else()
-   message(FATAL_ERROR "unsupported architecture")
-endif()
-
-#linking
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(CHIPMUNK_CONFIGURATION_SUFFIX " DLL")
-else()
-    if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
-        set(CHIPMUNK_CONFIGURATION_SUFFIX "")
-    else()
-        set(CHIPMUNK_CONFIGURATION_SUFFIX " SCRT")
-    endif()
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO slembcke/Chipmunk2D
@@ -26,48 +6,34 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/msvc/VS2015/chipmunk/chipmunk.vcxproj
-    RELEASE_CONFIGURATION "Release${CHIPMUNK_CONFIGURATION_SUFFIX}"
-    DEBUG_CONFIGURATION "Debug${CHIPMUNK_CONFIGURATION_SUFFIX}"
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_DEMOS=OFF
+        -DBUILD_SHARED=${KEYSTONE_BUILD_SHARED}
+        -DBUILD_STATIC=${KEYSTONE_BUILD_STATIC}
+        -DINSTALL_STATIC=${KEYSTONE_BUILD_STATIC}
 )
 
-message(STATUS "Installing")
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(INSTALL
-        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.dll"
-        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-    )
-    file(INSTALL
-        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.dll"
-        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
-        DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-    )
-else()
-    file(INSTALL
-        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-    )
-    file(INSTALL
-        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-    )
+vcpkg_install_cmake()
+
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+endif()
+
+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll)
+if(DLLS)
+    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+    file(REMOVE ${DLLS})
 endif()
 
-file(INSTALL
-    "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.lib"
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
-file(INSTALL
-    "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.lib"
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
 file(INSTALL
     ${SOURCE_PATH}/include/chipmunk
     DESTINATION ${CURRENT_PACKAGES_DIR}/include
 )
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/chipmunk RENAME copyright)
-
-message(STATUS "Installing done")
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index e95105dc2..d775cadbf 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -100,11 +100,6 @@ chartdir:arm64-windows=fail
 chartdir:arm-uwp=fail
 chartdir:x64-uwp=fail
 chartdir:x64-windows-static=fail
-chipmunk:arm64-windows=fail
-chipmunk:arm-uwp=fail
-chipmunk:x64-linux=fail
-chipmunk:x64-osx=fail
-chipmunk:x64-uwp=fail
 chmlib:arm-uwp=fail
 chmlib:x64-uwp=fail
 # Chromium Base requires a recent version of Clang to be installed.