-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[libgeotiff]Re-fix install files path. #6595
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 409c34f..692704d 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -298,7 +298,7 @@ SET(GEOTIFF_MAN_PAGES | ||
|
|
||
| # ${PROJECT_BINARY_DIR}/geotiff_version.h | ||
|
|
||
| -IF(WIN32) | ||
| +IF(0) | ||
| SET(DEFAULT_LIB_SUBDIR lib) | ||
| SET(DEFAULT_DATA_SUBDIR .) | ||
| SET(DEFAULT_INCLUDE_SUBDIR include) | ||
| @@ -313,6 +313,7 @@ ELSE() | ||
| SET(DEFAULT_BIN_SUBDIR bin) | ||
| SET(DEFAULT_LIB_SUBDIR lib) | ||
| SET(DEFAULT_DATA_SUBDIR share) | ||
| + SET(DEFAULT_TOOLS_SUBDIR tools) | ||
| SET(DEFAULT_INCLUDE_SUBDIR include) | ||
| ENDIF() | ||
|
|
||
| @@ -326,20 +327,23 @@ SET(GEOTIFF_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING | ||
| "Subdirectory where header files will be installed") | ||
| SET(GEOTIFF_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING | ||
| "Subdirectory where data will be installed") | ||
| +SET(GEOTIFF_TOOLS_SUBDIR ${DEFAULT_TOOLS_SUBDIR} CACHE STRING | ||
| + "Subdirectory where data will be installed") | ||
|
|
||
| # Mark *_SUBDIR variables as advanced and dedicated to use by power-users only. | ||
| -MARK_AS_ADVANCED(GEOTIFF_BIN_SUBDIR GEOTIFF_LIB_SUBDIR GEOTIFF_INCLUDE_SUBDIR GEOTIFF_DATA_SUBDIR) | ||
| +MARK_AS_ADVANCED(GEOTIFF_BIN_SUBDIR GEOTIFF_LIB_SUBDIR GEOTIFF_INCLUDE_SUBDIR GEOTIFF_DATA_SUBDIR GEOTIFF_TOOLS_SUBDIR) | ||
|
|
||
| # Full paths for the installation | ||
| SET(GEOTIFF_BIN_DIR ${GEOTIFF_BIN_SUBDIR}) | ||
| SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR}) | ||
| SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR}) | ||
| SET(GEOTIFF_DATA_DIR ${GEOTIFF_DATA_SUBDIR}) | ||
| +SET(GEOTIFF_TOOLS_DIR ${GEOTIFF_TOOLS_SUBDIR}) | ||
|
|
||
| # Install doc files | ||
| INSTALL(FILES | ||
| AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN | ||
| - DESTINATION doc) | ||
| + DESTINATION share/libgeotiff) | ||
| # DESTINATION ${GEOTIFF_DATA_DIR}/doc) | ||
|
|
||
| # Install CSV data files | ||
| diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt | ||
| index 6c6cc21..6bfc3b9 100644 | ||
| --- a/bin/CMakeLists.txt | ||
| +++ b/bin/CMakeLists.txt | ||
| @@ -35,6 +35,6 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build - done: ${GEOTIFF_UTILITIES}") | ||
| # Targets installation | ||
|
|
||
| INSTALL(TARGETS ${GEOTIFF_UTILITIES} | ||
| - RUNTIME DESTINATION ${GEOTIFF_BIN_DIR} | ||
| + RUNTIME DESTINATION ${GEOTIFF_TOOLS_DIR} | ||
| LIBRARY DESTINATION ${GEOTIFF_LIB_DIR} | ||
| ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR}) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We probably want to make the path
tools/libgeotiffortools/geotiff.That way we don't have to add special handling in the portfile.