libgeotiff: add version 1.7.3 #24156
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index c298a2e..bc0b6c1 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -5,6 +5,7 @@ | ||
|
|
@@ -46,31 +48,25 @@ | |
| SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILE_FLAGS} -std=c99") | ||
| SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS} -std=c++98") | ||
| IF(GEOTIFF_BUILD_PEDANTIC) | ||
| @@ -171,7 +172,7 @@ IF(WITH_TIFF) | ||
| FIND_PACKAGE(TIFF REQUIRED) | ||
| endif () | ||
|
|
||
| - IF(TIFF_FOUND) | ||
| + IF(0) | ||
| # Confirm required API is available | ||
| INCLUDE(CheckFunctionExists) | ||
| SET(CMAKE_REQUIRED_LIBRARIES ${TIFF_LIBRARIES}) | ||
| @@ -300,7 +301,7 @@ INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include) | ||
| ############################################################################### | ||
| # Build libxtiff library | ||
|
|
||
| -ADD_SUBDIRECTORY(libxtiff) | ||
| +# ADD_SUBDIRECTORY(libxtiff) | ||
|
|
||
| ############################################################################### | ||
| # Build libgeotiff library | ||
| @@ -345,7 +346,7 @@ IF(UNIX) | ||
| VERSION ${LINK_VERSION} | ||
| SOVERSION ${LINK_SOVERSION} | ||
| CLEAN_DIRECT_OUTPUT 1 ) | ||
|
|
@@ -79,24 +75,3 @@ | |
| set_target_properties( | ||
| ${GEOTIFF_LIBRARY_TARGET} | ||
| PROPERTIES | ||
|
There was a problem hiding this comment. You don't want to remove this. zlib & libjpeg are not direct dependencies of libgeotiff, it's old CMake style. There was a problem hiding this comment. @SpaceIm |
||
This file contains 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
This file contains 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
This file contains 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,40 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 4862f86..0fbc867 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -92,7 +92,7 @@ IF(WIN32) | ||
| ENDIF() | ||
|
|
||
| IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) | ||
| - SET(COMPILE_FLAGS "-fPIC -Wall -Wno-long-long") | ||
| + SET(COMPILE_FLAGS "-Wall -Wno-long-long") | ||
| SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILE_FLAGS} -std=c99") | ||
| SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS} -std=c++98") | ||
| IF(GEOTIFF_BUILD_PEDANTIC) | ||
| @@ -168,7 +168,7 @@ IF(WITH_TIFF) | ||
| FIND_PACKAGE(TIFF REQUIRED) | ||
| endif () | ||
|
|
||
| - IF(TIFF_FOUND) | ||
| + IF(0) | ||
| # Confirm required API is available | ||
| INCLUDE(CheckFunctionExists) | ||
| SET(CMAKE_REQUIRED_LIBRARIES ${TIFF_LIBRARIES}) | ||
| @@ -258,7 +258,7 @@ INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) | ||
| ############################################################################### | ||
| # Build libxtiff library | ||
|
|
||
| -ADD_SUBDIRECTORY(libxtiff) | ||
| +# ADD_SUBDIRECTORY(libxtiff) | ||
|
|
||
| ############################################################################### | ||
| # Build libgeotiff library | ||
| @@ -302,7 +302,7 @@ if(UNIX) | ||
| VERSION ${LINK_VERSION} | ||
| SOVERSION ${LINK_SOVERSION} | ||
| CLEAN_DIRECT_OUTPUT 1 ) | ||
| - if (APPLE) | ||
| + if (0) # no custom install_name, we want @rpath | ||
| set_target_properties( | ||
| ${GEOTIFF_LIBRARY_TARGET} | ||
| PROPERTIES |
This file contains 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 |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| versions: | ||
| "1.7.3": | ||
| folder: "all" | ||
| "1.7.1": | ||
| folder: "all" | ||
| "1.7.0": | ||
|
|
||
Oops, something went wrong.
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.
If there is a pkgconfig file in this new version, you should add pkg_config_name property in package_info()
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.
@SpaceIm
Thank you for your pointing.
I add
set_property("cmake_target_name", "geotiff_library").