[Git][debian-gis-team/shapelib][upstream] New upstream version 1.6.1~rc2

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / shapelib


Commits:
3ca72e22 by Bas Couwenberg at 2024-08-13T11:53:58+02:00
New upstream version 1.6.1~rc2
- - - - -


7 changed files:

- CMakeLists.txt
- Makefile.am
- Makefile.in
- + cmake/shapelib.gta.runsettings.in
- shapefil.h
- tests/CMakeLists.txt
- web/release.html


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -45,7 +45,7 @@ endif()
 
 # In windows all created dlls are gathered in the dll directory
 # if you add this directory to your PATH all shared libraries are available
-if(BUILD_SHARED_LIBS AND WIN32 AND NOT CYGWIN)
+if(BUILD_SHARED_LIBS AND (WIN32 OR CYGWIN))
   set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dll)
 endif()
 
@@ -250,6 +250,13 @@ if(BUILD_TESTING)
   foreach(executable shptest shputils)
     add_executable(${executable} ${executable}.c)
     target_link_libraries(${executable} PRIVATE ${PACKAGE})
+    if (BUILD_SHARED_LIBS AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.21" AND (WIN32 OR CYGWIN))
+      add_custom_command(
+        TARGET ${executable} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_RUNTIME_DLLS:${executable}> $<TARGET_FILE_DIR:${executable}>
+        COMMAND_EXPAND_LISTS
+      )
+    endif()
   endforeach()
 
   # Set environment variables defining path to executables being used


=====================================
Makefile.am
=====================================
@@ -16,6 +16,7 @@ EXTRA_DIST = makefile.vc CMakeLists.txt autogen.sh \
 		cmake/contrib.cmake \
 		cmake/project-config-version.cmake.in \
 		cmake/project-config.cmake.in \
+		cmake/shapelib.gta.runsettings.in \
 		cmake/shapelib.pc.cmake.in \
 		tests/CMakeLists.txt \
 		tests/dbf_test.cc \


=====================================
Makefile.in
=====================================
@@ -635,6 +635,7 @@ EXTRA_DIST = makefile.vc CMakeLists.txt autogen.sh \
 		cmake/contrib.cmake \
 		cmake/project-config-version.cmake.in \
 		cmake/project-config.cmake.in \
+		cmake/shapelib.gta.runsettings.in \
 		cmake/shapelib.pc.cmake.in \
 		tests/CMakeLists.txt \
 		tests/dbf_test.cc \


=====================================
cmake/shapelib.gta.runsettings.in
=====================================
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+	<GoogleTestAdapterSettings>
+		<SolutionSettings>
+			<Settings>
+				<WorkingDir>@PROJECT_SOURCE_DIR@</WorkingDir>
+			</Settings>
+		</SolutionSettings>
+	</GoogleTestAdapterSettings>
+</RunSettings>
\ No newline at end of file


=====================================
shapefil.h
=====================================
@@ -33,7 +33,7 @@ extern "C"
 
 #define SHAPELIB_VERSION_MAJOR 1
 #define SHAPELIB_VERSION_MINOR 6
-#define SHAPELIB_VERSION_MICRO 0
+#define SHAPELIB_VERSION_MICRO 1
 
 #define SHAPELIB_MAKE_VERSION_NUMBER(major, minor, micro)                      \
     ((major) * 10000 + (minor) * 100 + (micro))


=====================================
tests/CMakeLists.txt
=====================================
@@ -8,7 +8,7 @@ include(FetchContent)
 FetchContent_Declare(
   googletest
   GIT_REPOSITORY https://github.com/google/googletest.git
-  GIT_TAG v1.14.0
+  GIT_TAG v1.15.2
 )
 
 # For Windows: Prevent overriding the parent project's compiler/linker settings
@@ -32,4 +32,17 @@ foreach(executable dbf_test sbn_test shp_test)
   )
   target_compile_features(${executable} PUBLIC cxx_std_17)
   set_target_properties(${executable} PROPERTIES FOLDER "tests" CXX_EXTENSIONS OFF)
+  if (BUILD_SHARED_LIBS AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.21" AND (WIN32 OR CYGWIN))
+    add_custom_command(
+      TARGET ${executable} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_RUNTIME_DLLS:${executable}> $<TARGET_FILE_DIR:${executable}>
+      COMMAND_EXPAND_LISTS
+    )
+  endif()
 endforeach()
+
+configure_file(
+  ${CMAKE_SOURCE_DIR}/cmake/shapelib.gta.runsettings.in
+  ${CMAKE_BINARY_DIR}/shapelib.gta.runsettings
+  @ONLY
+)


=====================================
web/release.html
=====================================
@@ -43,6 +43,8 @@ the project mailing list at https://lists.osgeo.org/pipermail/shapelib/.<p>
 <li>CMake: Remove duplicated shapefil.h installation in include_dir/shapelib (#80)</li>
 <li>CMake: Remove INSTALL_NAME_DIR from target (#49)</li>
 <li>CMake: Fix contrib.cmake</li>
+<li>CMake: (>= 3.21) Fix ctest paths for shared libs (MSVC and CygWin)</li>
+<li>CMake: Add GoogleTestAdapter (GTA) Run Settings</li>
 </ul>
 
 <b>Release 1.6.0</b>:



View it on GitLab: https://salsa.debian.org/debian-gis-team/shapelib/-/commit/3ca72e225cdf97682f320070399e50de2803350d

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/shapelib/-/commit/3ca72e225cdf97682f320070399e50de2803350d
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/20240813/ee090bf8/attachment-0001.htm>