5 files changed, 19 insertions, 34 deletions
diff --git a/ports/bigint/CMakeLists.txt b/ports/bigint/CMakeLists.txt
index e4cccbe12..fffc94192 100644
--- a/ports/bigint/CMakeLists.txt
+++ b/ports/bigint/CMakeLists.txt
@@ -1,14 +1,11 @@
-cmake_minimum_required(VERSION 3.8.0)
-project(bigint)
+cmake_minimum_required(VERSION 3.14.0)
+project(bigint CXX)
 
 if(MSVC)
-  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+	add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
 endif()
 
-include_directories(".")
-
-set(
-  bigint_srcs
+set(BIGINT_SRCS
 	BigUnsigned.cc
 	BigInteger.cc
 	BigIntegerAlgorithms.cc
@@ -16,8 +13,7 @@ set(
 	BigIntegerUtils.cc
 )
 
-set(
-  bigint_hh
+set(BIGINT_HH
 	NumberlikeArray.hh
 	BigUnsigned.hh
 	BigInteger.hh
@@ -27,15 +23,20 @@ set(
 	BigIntegerUtils.hh
 )
 
-add_library(bigint ${bigint_srcs})
+add_library(bigint ${BIGINT_SRCS})
+target_include_directories(bigint PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+
+install(
+	TARGETS bigint
+	EXPORT bigint-config
+)
 
 install(
-  TARGETS bigint
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
+	EXPORT bigint-config
+	NAMESPACE bigint::
+	DESTINATION share/bigint
 )
 
 if(NOT DISABLE_INSTALL_HEADERS)
-  install(FILES ${bigint_hh}  DESTINATION include/bigint)
+	install(FILES ${BIGINT_HH} DESTINATION include/bigint)
 endif()
diff --git a/ports/bigint/CONTROL b/ports/bigint/CONTROL
index d6291ac68..1f0d8f63b 100644
--- a/ports/bigint/CONTROL
+++ b/ports/bigint/CONTROL
@@ -1,5 +1,5 @@
 Source: bigint
 Version: 2010.04.30
-Port-Version: 5
+Port-Version: 6
 Homepage: https://mattmccutchen.net/bigint
 Description: C++ Big Integer Library
diff --git a/ports/bigint/portfile.cmake b/ports/bigint/portfile.cmake
index 07c43836f..723169750 100644
--- a/ports/bigint/portfile.cmake
+++ b/ports/bigint/portfile.cmake
@@ -21,7 +21,6 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets()
 
-configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
-file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/bigint RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/bigint/usage b/ports/bigint/usage
deleted file mode 100644
index cf9dc6474..000000000
--- a/ports/bigint/usage
+++ /dev/null
@@ -1,5 +0,0 @@
-The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
-
-    find_package(@PORT@ CONFIG REQUIRED)
-    target_include_directories(main PRIVATE ${BIGINT_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${BIGINT_LIBRARIES})
diff --git a/ports/bigint/vcpkg-cmake-wrapper.cmake b/ports/bigint/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 92972c09f..000000000
--- a/ports/bigint/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-include(SelectLibraryConfigurations)
-
-find_path(BIGINT_INCLUDE_DIR BigInteger.hh PATH_SUFFIXES bigint)
-find_library(BIGINT_LIBRARY_DEBUG NAMES bigint NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
-find_library(BIGINT_LIBRARY_RELEASE NAMES bigint NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
-
-select_library_configurations(BIGINT)
-
-set(BIGINT_INCLUDE_DIRS ${BIGINT_INCLUDE_DIR})
-set(BIGINT_LIBRARIES ${BIGINT_LIBRARY})