diff --git a/ports/gapp/fix-install.patch b/ports/gapp/fix-install.patch
new file mode 100644
index 00000000000000..0427e9ab2c2f6c
--- /dev/null
+++ b/ports/gapp/fix-install.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d9f1b4..27f659c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -154,9 +154,9 @@ endif()
+ 
+ # Install
+ install(TARGETS gapp EXPORT gapp-config
+-        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>"
+-        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>"
+-        RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>")
++        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ 
+ install(DIRECTORY "src/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gapp" FILES_MATCHING PATTERN "*.hpp" PATTERN "*.txt")
+ install(DIRECTORY "docs/" DESTINATION "${CMAKE_INSTALL_DOCDIR}" FILES_MATCHING PATTERN "*.md")
+@@ -164,5 +164,5 @@ install(DIRECTORY "docs/" DESTINATION "${CMAKE_INSTALL_DOCDIR}" FILES_MATCHI
+ if(MSVC AND BUILD_SHARED_LIBS)
+-    install(FILES "$<TARGET_PDB_FILE:gapp>" DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>")
++    install(FILES "$<TARGET_PDB_FILE:gapp>" DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ endif()
+ 
+ export(TARGETS gapp NAMESPACE gapp::
diff --git a/ports/gapp/portfile.cmake b/ports/gapp/portfile.cmake
index d7de00f2690598..9c4828fcb4ba50 100644
--- a/ports/gapp/portfile.cmake
+++ b/ports/gapp/portfile.cmake
@@ -1,29 +1,39 @@
 if(VCPKG_TARGET_IS_WINDOWS)
-  vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
 
 vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO KRM7/gapp
-  REF "v${VERSION}"
-  SHA512 de6e1d9e28590cc569c05fe3b2462245940fcca5c8ffbc2974758062f88d3165e527fdc273bb290eb1080dd899d78b540fc7d0f62d7236b289a63e138484f5f0
-  HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KRM7/gapp
+    REF "v${VERSION}"
+    SHA512 16588f6feb60ebdea7fe8777f231fca78285b15a58975ea228ed6b706c6ccf46b17e3cd8bc8c2eb938222439ef28170bc25b15a527c3ac70d7eb76ce0d6665b3
+    HEAD_REF master
+    PATCHES
+        fix-install.patch
 )
 
 vcpkg_cmake_configure(
-  SOURCE_PATH "${SOURCE_PATH}"
-  OPTIONS
-    -DGAPP_BUILD_TESTS=OFF
-    -DGAPP_USE_LTO=OFF
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DGAPP_BUILD_TESTS=OFF
+        -DGAPP_USE_LTO=OFF
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gapp)
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc/gapp/api")
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string(
+        "${CURRENT_PACKAGES_DIR}/include/gapp/utility/utility.hpp"
+        "#if defined(_WIN32) && !defined(GAPP_BUILD_STATIC)"
+        "#ifndef GAPP_BUILD_STATIC\n#define GAPP_BUILD_STATIC\n#endif\n\n#if defined(_WIN32) && !defined(GAPP_BUILD_STATIC)"
+    )
+endif()
 
-configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/share/doc/gapp/api"
+)
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/gapp/usage b/ports/gapp/usage
deleted file mode 100644
index bcfbbdff6f35cf..00000000000000
--- a/ports/gapp/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-gapp provides CMake targets:
-
-    find_package(gapp CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE gapp::gapp)
diff --git a/ports/gapp/vcpkg.json b/ports/gapp/vcpkg.json
index 5984aadd42f20a..db0b5c9bff637c 100644
--- a/ports/gapp/vcpkg.json
+++ b/ports/gapp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "gapp",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A genetic algorithms library in C++ for single- and multi-objective optimization.",
   "homepage": "https://github.com/KRM7/gapp",
   "license": "MIT",
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index b6b55006f706d1..3732f71ab6800d 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -343,8 +343,6 @@ g3log:x64-android=fail
 gamenetworkingsockets:arm-neon-android=fail
 gamenetworkingsockets:arm64-android=fail
 gamenetworkingsockets:x64-android=fail
-gapp:arm64-osx=fail # requires c++20
-gapp(android)=fail # requires c++20
 gdal[arrow,parquet](!(arm64 | x64))=cascade
 gdal[aws-ec2-windows](!windows)=cascade
 gdal[iconv]:arm64-linux=feature-fails
diff --git a/versions/baseline.json b/versions/baseline.json
index 4a73528cdc9bdc..6c3d070ef0dd43 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3325,7 +3325,7 @@
       "port-version": 6
     },
     "gapp": {
-      "baseline": "1.0.0",
+      "baseline": "1.0.1",
       "port-version": 0
     },
     "gasol": {
diff --git a/versions/g-/gapp.json b/versions/g-/gapp.json
index 31e60e13af4fd4..0597b5a05817f1 100644
--- a/versions/g-/gapp.json
+++ b/versions/g-/gapp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "32207cad2d45e1b9edf689ddeb23cf5f28ae3a1f",
+      "version": "1.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "6fa4c0e7c1232f8b5a74613c115eb3319b2ca7fc",
       "version": "1.0.0",