3 files changed, 47 insertions, 17 deletions
diff --git a/ports/cppitertools/CONTROL b/ports/cppitertools/CONTROL
index 579a85a69..f74188303 100644
--- a/ports/cppitertools/CONTROL
+++ b/ports/cppitertools/CONTROL
@@ -1,4 +1,5 @@
 Source: cppitertools
-Version: 2019-04-14-3
+Version: 2.0
+Homepage: https://github.com/ryanhaining/cppitertools
 Description: Range-based for loop add-ons inspired by the Python builtins and itertools library
 Build-Depends: boost-optional
diff --git a/ports/cppitertools/fix-cmake-install-dir.patch b/ports/cppitertools/fix-cmake-install-dir.patch
new file mode 100644
index 000000000..e3591f9ba
--- /dev/null
+++ b/ports/cppitertools/fix-cmake-install-dir.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3caa411..775ce02 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_library(cppitertools::cppitertools ALIAS cppitertools)
+
+ target_include_directories(cppitertools INTERFACE
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+-        $<INSTALL_INTERFACE:${cppitertools_INSTALL_CMAKE_DIR}/cppitertools>
++        $<INSTALL_INTERFACE:${cppitertools_INSTALL_INCLUDE_DIR}/cppitertools>
+         )
+
+
+@@ -37,5 +37,5 @@ install(EXPORT cppitertools-targets
+         DESTINATION ${cppitertools_INSTALL_CMAKE_DIR}/cppitertools
+         )
+
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppitertools-config-version.cmake DESTINATION ${cppitertools_INSTALL_CMAKE_DIR})
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppitertools-config-version.cmake DESTINATION ${cppitertools_INSTALL_CMAKE_DIR}/cppitertools)
+ install(DIRECTORY . DESTINATION ${cppitertools_INSTALL_INCLUDE_DIR}/cppitertools)
diff --git a/ports/cppitertools/portfile.cmake b/ports/cppitertools/portfile.cmake
index 26b6ee93b..81ba94742 100644
--- a/ports/cppitertools/portfile.cmake
+++ b/ports/cppitertools/portfile.cmake
@@ -1,16 +1,25 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO ryanhaining/cppitertools
-    REF 97bfd33cdc268426b20f189c13d3ed88f5e1f4c2
-    SHA512 7b8926cf00b5be17fa89a1d1aea883e60848187bb00d637c40a20f6e11811add4785f2f461e530a6cd557d3be16490799ffcd7ea90bd7b58fdca549c3df03e8c
-    HEAD_REF master
-)
-
-file(GLOB INCLUDE_FILES ${SOURCE_PATH}/*.hpp)
-file(GLOB INCLUDE_INTERNAL_FILES ${SOURCE_PATH}/internal/*.hpp)
-
-file(COPY ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cppitertools)
-file(COPY ${INCLUDE_INTERNAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cppitertools/internal)
-
-# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ryanhaining/cppitertools
+    REF d716cf6c8281ab6383d1fbecb456e0b9d808694c
+    SHA512 47bc490d798b445e965169a754dc977d5add217f133130671301dee6294744fa4b3f7a3b146cbd002c31325e5bc7c2206d57560a6db58693ca13ca972ca09d39
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -Dcppitertools_INSTALL_CMAKE_DIR=share
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug
+    ${CURRENT_PACKAGES_DIR}/share/cppitertools-config-version.cmake)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.md
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppitertools
+    RENAME copyright)