[Git][debian-gis-team/libgeotiff][experimental] 4 commits: New upstream version 1.7.1~rc2
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Mar 10 09:26:21 GMT 2022
Bas Couwenberg pushed to branch experimental at Debian GIS Project / libgeotiff
Commits:
ba5f4e35 by Bas Couwenberg at 2022-03-10T10:14:59+01:00
New upstream version 1.7.1~rc2
- - - - -
d4a98732 by Bas Couwenberg at 2022-03-10T10:15:03+01:00
Update upstream source from tag 'upstream/1.7.1_rc2'
Update to upstream version '1.7.1~rc2'
with Debian dir 3e7e961cf3a8642ba786d8323d2fd3a373fe06a0
- - - - -
15b3df08 by Bas Couwenberg at 2022-03-10T10:15:16+01:00
New upstream release candidate.
- - - - -
e6157932 by Bas Couwenberg at 2022-03-10T10:15:54+01:00
Set distribution to experimental.
- - - - -
4 changed files:
- CMakeLists.txt
- NEWS
- cmake/project-config.cmake.in
- debian/changelog
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -73,8 +73,10 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
# Platform and compiler specific settings
IF(WIN32)
- IF(MSVC)
+ IF(BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DBUILD_AS_DLL=1)
+ ENDIF()
+ IF(MSVC)
ADD_DEFINITIONS(/DW4)
if (NOT (MSVC_VERSION VERSION_LESS 1400))
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
@@ -328,19 +330,20 @@ endif()
SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
OUTPUT_NAME ${GEOTIFF_LIB_NAME})
+set(CONFIG_DEPENDENCIES "")
if(TARGET TIFF::TIFF)
-target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PUBLIC TIFF::TIFF)
-else()
+ set(TIFF_LIBRARIES TIFF::TIFF)
+ string(APPEND CONFIG_DEPENDENCIES " find_dependency(TIFF)\n")
+endif()
target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PUBLIC
${TIFF_LIBRARIES})
-endif()
if(TARGET PROJ::proj)
-target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PRIVATE PROJ::proj)
-else()
+ set(PROJ_LIBRARIES PROJ::proj)
+ string(APPEND CONFIG_DEPENDENCIES " find_dependency(PROJ CONFIG)\n")
+endif()
target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PRIVATE
${PROJ_LIBRARIES})
-endif()
target_include_directories(
${GEOTIFF_LIBRARY_TARGET}
=====================================
NEWS
=====================================
@@ -11,6 +11,10 @@ libgeotiff 1.7.1
* ReadKey(): only allow reading a key with TIFFTagLocation=0 that has a count of 1 to avoid reading an illegal address (and crashing) when using GTIFKeyGet() or PrintKey() (fixes #66)
* ReadKey(): add extra warning messages
* CMake: avoid INTERFACE_LINK_LIBRARIES vs LINK_INTERFACE_LIBRARIES_DEBUG warning about TIFF
+* CMake: Fix dllexport
+* CMake: Revise exported cmake config wrt BUILD_SHARED_LIBS
+* CMake: Revise exported cmake config wrt dependencies
+* CMake: Respect <Pkg>_FIND_QUIETLY
libgeotiff 1.7.0
----------------
=====================================
cmake/project-config.cmake.in
=====================================
@@ -3,14 +3,9 @@
# Set
# @PROJECT_NAME at _FOUND = 1
# @PROJECT_NAME at _INCLUDE_DIRS = /usr/local/include
-# @PROJECT_NAME at _SHARED_LIBRARIES = geotiff_library
-# @PROJECT_NAME at _STATIC_LIBRARIES = geotiff_archive
# @PROJECT_NAME at _LIBRARY_DIRS = /usr/local/lib
# @PROJECT_NAME at _BINARY_DIRS = /usr/local/bin
# @PROJECT_NAME at _VERSION = 1.4.1 (for example)
-# Depending on @PROJECT_NAME at _USE_STATIC_LIBS
-# @PROJECT_NAME at _LIBRARIES = ${@PROJECT_NAME at _SHARED_LIBRARIES}, if OFF
-# @PROJECT_NAME at _LIBRARIES = ${@PROJECT_NAME at _STATIC_LIBRARIES}, if ON
# For compatibility with FindGeoTIFF.cmake, also set
# @PROJECT_NAME_UPPER at _FOUND
@@ -18,38 +13,39 @@
# @PROJECT_NAME_UPPER at _LIBRARY
# @PROJECT_NAME_UPPER at _LIBRARIES
-message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}")
-# @PROJECT_NAME at _VERSION is set by version file
-message (STATUS
- "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME at _VERSION}")
-
# Tell the user project where to find our headers and libraries
get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
set (@PROJECT_NAME at _INCLUDE_DIRS "${_ROOT}/include")
set (@PROJECT_NAME at _LIBRARY_DIRS "${_ROOT}/lib")
set (@PROJECT_NAME at _BINARY_DIRS "${_ROOT}/bin")
+unset (_ROOT)
+unset (_DIR)
-message (STATUS " include directory: \${@PROJECT_NAME at _INCLUDE_DIRS}")
-
-if(BUILD_SHARED_LIBS)
-set (@PROJECT_NAME at _SHARED_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
+set (@PROJECT_NAME at _LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
+if("@BUILD_SHARED_LIBS@")
+ set (@PROJECT_NAME at _SHARED_LIBRARIES ${@PROJECT_NAME at _LIBRARIES})
else()
-set (@PROJECT_NAME at _STATIC_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
+ set (@PROJECT_NAME at _STATIC_LIBRARIES ${@PROJECT_NAME at _LIBRARIES})
+ include(CMakeFindDependencyMacro)
+ at CONFIG_DEPENDENCIES@
endif()
-# Read in the exported definition of the library
-include ("${_DIR}/@PROJECT_NAME_LOWER at -depends.cmake")
-unset (_ROOT)
-unset (_DIR)
+if(NOT @PROJECT_NAME at _FIND_QUIETLY)
+ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}")
+ # @PROJECT_NAME at _VERSION is set by version file
+ message (STATUS
+ "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME at _VERSION}")
+ message (STATUS " include directory: \${@PROJECT_NAME at _INCLUDE_DIRS}")
+ if("@BUILD_SHARED_LIBS@")
+ message (STATUS " \${@PROJECT_NAME at _LIBRARIES} set to shared library")
+ else()
+ message (STATUS " \${@PROJECT_NAME at _LIBRARIES} set to static libraries")
+ endif()
+endif()
-if (@PROJECT_NAME at _USE_STATIC_LIBS)
- set (@PROJECT_NAME at _LIBRARIES ${@PROJECT_NAME at _STATIC_LIBRARIES})
- message (STATUS " \${@PROJECT_NAME at _LIBRARIES} set to static library")
-else ()
- set (@PROJECT_NAME at _LIBRARIES ${@PROJECT_NAME at _SHARED_LIBRARIES})
- message (STATUS " \${@PROJECT_NAME at _LIBRARIES} set to shared library")
-endif ()
+# Read in the exported definition of the library
+include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME_LOWER at -depends.cmake")
# For compatibility with FindGeoTIFF.cmake
set (@PROJECT_NAME_UPPER at _FOUND 1)
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+libgeotiff (1.7.1~rc2-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 10 Mar 2022 10:15:39 +0100
+
libgeotiff (1.7.1~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
View it on GitLab: https://salsa.debian.org/debian-gis-team/libgeotiff/-/compare/6e0e6c39803681a1789d0f4099290e831a76a440...e61579329b9c17643651d5deee9f56c169c926b5
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/libgeotiff/-/compare/6e0e6c39803681a1789d0f4099290e831a76a440...e61579329b9c17643651d5deee9f56c169c926b5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220310/f2d1305c/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list