early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,34 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3b3b51..ea3f129 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,8 +73,8 @@ set(
# Export build information to help other projects link installed
# shapelib software. Only one of these signatures is required
-# for the export_shp name.
-install(EXPORT export_shp DESTINATION ${CMAKE_INSTALL_SHP_DATADIR})
+# for the shpConfig name.
+install(EXPORT shpConfig DESTINATION ${CMAKE_INSTALL_SHP_DATADIR})
# Initial boilerplate done, now build library and executables.
@@ -127,12 +127,17 @@ if(USE_RPATH)
endif(USE_RPATH)
install(TARGETS shp
- EXPORT export_shp
+ EXPORT shpConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
+INSTALL(EXPORT shpConfig
+ DESTINATION share/shp
+)
+
+
# executables to be built and installed.
set(executables
shpcreate

View File

@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3ef935..845ec06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,7 +148,7 @@ set(executables
find_program(BASH_EXECUTABLE bash)
find_program(SED_EXECUTABLE sed)
if(BASH_EXECUTABLE AND SED_EXECUTABLE)
- set(BUILD_TEST ON)
+ option(BUILD_TEST "" ON)
else(BASH_EXECUTABLE AND SED_EXECUTABLE)
message(STATUS "WARNING: sed or bash not available so disabling testing")
endif(BASH_EXECUTABLE AND SED_EXECUTABLE)

50
externals/vcpkg/ports/shapelib/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,50 @@
set(SHAPELIB_VERSION 1.5.0)
set(SHAPELIB_HASH 230939afb33aee042808a32b38ee9dfc7ec1f39432e5a4ebe3fda99c2f87bfbebc91830d4e21691c51aae3f4bb65d7e71e7061472bb08124dcd3402c46800d6c)
vcpkg_download_distfile(ARCHIVE
URLS "http://download.osgeo.org/shapelib/shapelib-${SHAPELIB_VERSION}.zip"
FILENAME "shapelib-${SHAPELIB_VERSION}.zip"
SHA512 ${SHAPELIB_HASH}
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES
option-build-test.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TEST=OFF
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME shp)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe")
if(EXES)
file(COPY ${EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/shapelib")
file(REMOVE ${EXES})
endif()
file(GLOB DEBUG_EXES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
if(DEBUG_EXES)
file(REMOVE ${DEBUG_EXES})
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/shapelib")
vcpkg_copy_pdbs()

17
externals/vcpkg/ports/shapelib/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,17 @@
{
"name": "shapelib",
"version": "1.5.0",
"port-version": 3,
"description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles",
"homepage": "https://download.osgeo.org/shapelib",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}