[triangle] Revise CMakeLists.txt and exported config (#41488)

ports/triangle/CMakeLists.txt

@@ -1,45 +1,47 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5...3.30)
 project(triangle)
 
+option(BUILD_TOOL "Build the command line tool" OFF)
+
 include(GNUInstallDirs)
 
-add_library(triangleLib triangle.c exports.def)
+add_library(triangle triangle.c exports.def)
-add_executable(triangle triangle.c)
+set_target_properties(triangle PROPERTIES PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/triangle.h")
+target_compile_definitions(triangle PRIVATE -DTRILIBRARY)
 
-target_compile_definitions(triangleLib PRIVATE -DTRILIBRARY -DANSI_DECLARATORS)
+add_executable(triangle_exe triangle.c)
-target_compile_definitions(triangle PRIVATE -DANSI_DECLARATORS)
+set_target_properties(triangle_exe PROPERTIES OUTPUT_NAME "triangle")
-if(WIN32)
-   target_compile_definitions(triangleLib PRIVATE -DNO_TIMER)
-   target_compile_definitions(triangle PRIVATE -DNO_TIMER)
-endif()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+foreach(target IN ITEMS triangle triangle_exe)
-    target_link_libraries(triangle m)
+    target_compile_definitions(${target} PRIVATE -DANSI_DECLARATORS)
-endif()
+    target_include_directories(${target} PUBLIC
+        "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>"
+        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+    )
+    if(WIN32)
+        target_compile_definitions(${target} PRIVATE -DNO_TIMER)
+    endif()
+    if(UNIX AND NOT APPLE AND NOT ANDROID)
+        target_link_libraries(${target} PRIVATE m)
+    endif()
+endforeach()
 
-target_include_directories(triangleLib PUBLIC
+install(TARGETS triangle
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
+    EXPORT triangle-targets
-)
-
-set_target_properties(triangleLib PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-set_target_properties(triangleLib PROPERTIES PUBLIC_HEADER
-    "${CMAKE_SOURCE_DIR}/triangle.h"
-)
-
-set_target_properties(triangleLib PROPERTIES OUTPUT_NAME "triangle")
-
-install(TARGETS triangleLib EXPORT triangleTargets
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 
-install(TARGETS triangle DESTINATION tools/triangle)
+install(EXPORT triangle-targets
-
+  FILE unofficial-triangle-config.cmake
-install(EXPORT triangleTargets
+  NAMESPACE unofficial::triangle::
-  FILE triangleConfig.cmake
+  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-triangle"
-  NAMESPACE triangle::
-  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/triangle"
 )
+
+if(BUILD_TOOL)
+    install(TARGETS triangle_exe DESTINATION tools/triangle)
+else()
+    set_target_properties(triangle_exe PROPERTIES EXCLUDE_FROM_ALL 1)
+endif()

ports/triangle/portfile.cmake

@@ -11,21 +11,31 @@ vcpkg_extract_source_archive(
     PATCHES
         "enable_64bit_architecture.patch"
 )
-
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}")
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS options
+    FEATURES
+        tool    BUILD_TOOL
+)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${options}
+    OPTIONS_DEBUG
+        -DBUILD_TOOL=OFF
 )
 
 vcpkg_cmake_install()
-
 vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-triangle)
 
-vcpkg_cmake_config_fixup()
+# migration polyfill
+file(COPY "${CURRENT_PORT_DIR}/triangleConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/triangle")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
 
+file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/triangle")
 file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/triangle/triangleConfig.cmake

@@ -0,0 +1,6 @@
+file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage)
+message(WARNING "find_package(${CMAKE_FIND_PACKAGE_NAME}) is deprecated.\n${usage}")
+
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-triangle)
+add_library(triangleLib ALIAS unofficial::triangle::triangle)

ports/triangle/usage

@@ -0,0 +1,4 @@
+triangle provides CMake targets:
+
+  find_package(unofficial-triangle CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE unofficial::triangle::triangle)

ports/triangle/vcpkg.json

@@ -1,9 +1,10 @@
 {
   "name": "triangle",
   "version": "1.6",
-  "port-version": 3,
+  "port-version": 4,
   "description": "A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.",
   "homepage": "http://www.cs.cmu.edu/~quake/triangle.html",
+  "license": null,
   "supports": "!uwp",
   "dependencies": [
     {
@@ -14,5 +15,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tool": {
+      "description": "Build the command line tool."
+    }
+  }
 }

versions/baseline.json

@@ -9062,7 +9062,7 @@
     },
     "triangle": {
       "baseline": "1.6",
-      "port-version": 3
+      "port-version": 4
     },
     "triton": {
       "baseline": "2023-08-16",

versions/t-/triangle.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bd79d7af32634104384879113cbf1158b1e72a8f",
+      "version": "1.6",
+      "port-version": 4
+    },
     {
       "git-tree": "b751d577254b617b208ac8e1e828be1a539f8123",
       "version": "1.6",