Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions ports/gapp/fix-install.patch
Original file line number Diff line number Diff line change
@@ -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::
38 changes: 24 additions & 14 deletions ports/gapp/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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")
4 changes: 0 additions & 4 deletions ports/gapp/usage

This file was deleted.

2 changes: 1 addition & 1 deletion ports/gapp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.feature.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3325,7 +3325,7 @@
"port-version": 6
},
"gapp": {
"baseline": "1.0.0",
"baseline": "1.0.1",
"port-version": 0
},
"gasol": {
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gapp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "32207cad2d45e1b9edf689ddeb23cf5f28ae3a1f",
"version": "1.0.1",
"port-version": 0
},
{
"git-tree": "6fa4c0e7c1232f8b5a74613c115eb3319b2ca7fc",
"version": "1.0.0",
Expand Down