Version 3.7.0

This commit is contained in:
Jerry James 2025-11-23 13:25:12 -07:00
commit 025aa89f89
3 changed files with 37 additions and 38 deletions

View file

@ -1,6 +1,6 @@
--- zimpl/CMakeLists.txt.orig 2023-08-08 06:33:21.000000000 -0600
+++ zimpl/CMakeLists.txt 2023-11-15 21:04:39.935423110 -0700
@@ -41,8 +41,6 @@ endif()
--- zimpl-3.7.0/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700
+++ zimpl-3.7.0/CMakeLists.txt 2025-11-23 13:14:26.606931058 -0700
@@ -49,8 +49,6 @@ endif()
# use C99 standard
set(CMAKE_C_STANDARD 99)
@ -9,9 +9,9 @@
option(ZLIB "use ZLIB" ON)
option(SANITIZE_ADDRESS "should the address sanitizer be enabled in debug mode if available" OFF)
--- zimpl/src/CMakeLists.txt.orig 2023-08-08 06:33:23.000000000 -0600
+++ zimpl/src/CMakeLists.txt 2023-11-15 21:04:39.936423097 -0700
@@ -118,12 +118,10 @@ if(MSVC)
--- zimpl-3.7.0/src/CMakeLists.txt.orig 2025-11-23 05:19:53.000000000 -0700
+++ zimpl-3.7.0/src/CMakeLists.txt 2025-11-23 13:15:22.276583290 -0700
@@ -119,12 +119,10 @@ if(MSVC)
endif()
#create zimpl with pic
@ -28,23 +28,26 @@
target_link_libraries(libzimpl ${libs})
#create zimpl binary
@@ -140,21 +138,18 @@ endif()
@@ -141,16 +139,13 @@ endif()
set_target_properties(libzimpl PROPERTIES
OUTPUT_NAME "zimpl")
-set_target_properties(libzimpl-pic PROPERTIES
- OUTPUT_NAME "zimpl-pic")
-
include(GNUInstallDirs)
# install the header files of zimpl
install(FILES ${headers} DESTINATION include/zimpl)
install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zimpl)
# install the binary and the library to appropriate locations and add them to an export group
-install(TARGETS libzimpl zimpl libzimpl-pic EXPORT zimpl-targets
+install(TARGETS libzimpl zimpl EXPORT zimpl-targets
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin
INCLUDES DESTINATION include)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -164,7 +159,7 @@ endif()
install(FILES ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/zimpl)
# Add library targets to the build-tree export set
-export(TARGETS libzimpl libzimpl-pic
@ -52,9 +55,9 @@
FILE "${CMAKE_BINARY_DIR}/zimpl-targets.cmake")
#configure the config file for the build tree
--- zimpl/src/zimpl/zimpllib.c.orig 2023-08-08 06:33:23.000000000 -0600
+++ zimpl/src/zimpl/zimpllib.c 2023-11-15 21:04:39.936423097 -0700
@@ -456,3 +456,66 @@ bool zpl_read_with_args(char** argv, int
--- zimpl-3.7.0/src/zimpl/zimpllib.c.orig 2025-11-23 05:19:53.000000000 -0700
+++ zimpl-3.7.0/src/zimpl/zimpllib.c 2025-11-23 13:14:26.607519615 -0700
@@ -455,3 +455,66 @@ bool zpl_read_with_args(char** argv, int
return ret;
}
@ -121,8 +124,8 @@
+{
+ abort();
+}
--- zimpl/zimpl-config.cmake.in.orig 2023-08-08 06:33:23.000000000 -0600
+++ zimpl/zimpl-config.cmake.in 2023-11-15 21:04:39.936423097 -0700
--- zimpl-3.7.0/zimpl-config.cmake.in.orig 2025-11-23 05:19:53.000000000 -0700
+++ zimpl-3.7.0/zimpl-config.cmake.in 2025-11-23 13:14:26.607724336 -0700
@@ -3,7 +3,7 @@ if(NOT TARGET libzimpl)
endif()