Skip to content

[shapelib] Fix shapelib usage #22633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 4 commits into from
Mar 21, 2022
Merged

[shapelib] Fix shapelib usage #22633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2555633
[shapelib] Fix shapelib usage
JonLiu1993 Jan 19, 2022
34521a6
update version
JonLiu1993 Jan 19, 2022
213ef5c
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Jan 27, 2022
33bfcd4
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Mar 18, 2022
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
34 changes: 34 additions & 0 deletions ports/shapelib/fix-usage.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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})
Copy link
Copy Markdown
Contributor

@JackBoosY JackBoosY Mar 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also please report this to the upstream plase.


# 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
4 changes: 2 additions & 2 deletions ports/shapelib/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "shapelib",
"version-string": "1.5.0",
"port-version": 2,
"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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6414,7 +6414,7 @@
},
"shapelib": {
"baseline": "1.5.0",
"port-version": 2
"port-version": 3
},
"shiva": {
"baseline": "1.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/shapelib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "befbba83687abe4b10f1fb55ac5ccc344bd11084",
"version": "1.5.0",
"port-version": 3
},
{
"git-tree": "d70a93c1899b5607ca1894c66beacec5c1afec9c",
"version-string": "1.5.0",
Expand Down