use RELEASE_POSTFIX to add the RELNUM to libraries

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3838d3335a02034a53b49ff96f44122045b39c6..7545a7a3783d9b6ff40a77a192358513a3299e47 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,13 +2,17 @@ cmake_minimum_required (VERSION 3.1)
 project(zziplib C)
 set(VERSION "0.13.69")
 
+if(NOT CMAKE_BUILD_TYPE) 
+    set(CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
+# the "0." on FIXNUM is just for compatibility with automake's libtool.
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "0.\\3" FIXNUM ${VERSION})
 MESSAGE(STATUS "VERSION ${VERSION} -> RELNUM ${RELNUM}")
 MESSAGE(STATUS "VERSION ${VERSION} -> VERNUM ${VERNUM}")
 MESSAGE(STATUS "VERSION ${VERSION} -> FIXNUM ${FIXNUM}")
-# the "0." on FIXNUM is just for compatibility with automake's libtool.
 
 ### Path to additional CMake modules
 # set(CMAKE_MODULE_PATH

diff --git a/Makefile b/Makefile
index c9c0703d92676296d6f27469faaa78a16453a262..645833d32a5f99b80f385fb0b04229bca0c50501 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ static: conf build local
 
 st: ; $(MAKE) distclean && $(MAKE) static
 it: ; $(MAKE) distclean && $(MAKE) builds
+cc: ; $(MAKE) distclean && $(MAKE) config
 
 .PHONY: build
 build:

diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
index c42d2dc3924a8b69319515bf199bcf6788990f19..fc948d1d9ce6bda6feb2bd8d3967d39d068166fc 100644 (file)
--- a/SDL/CMakeLists.txt
+++ b/SDL/CMakeLists.txt
@@ -2,7 +2,11 @@ cmake_minimum_required (VERSION 3.1)
 project(zzipsdl C)
 set(VERSION "0.13.69")
 
-if(NOT RELNUM)
+if(NOT CMAKE_BUILD_TYPE) 
+    set(CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
+if(NOT ${RELNUM})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\3" FIXNUM ${VERSION})

diff --git a/bins/CMakeLists.txt b/bins/CMakeLists.txt
index c737443034c5d8b1c909bba2f14b0878ff1fbba3..97f8b77cd5edb9a8207578a0d25bbe79ef480ce0 100644 (file)
--- a/bins/CMakeLists.txt
+++ b/bins/CMakeLists.txt
@@ -2,7 +2,11 @@ cmake_minimum_required (VERSION 3.1)
 project(zzipbins C)
 set(VERSION "0.13.69")
 
-if(NOT RELNUM)
+if(NOT CMAKE_BUILD_TYPE) 
+    set(CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
+if(NOT ${RELNUM})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\3" FIXNUM ${VERSION})

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ea253e024827bdab14daf18ab15090a446b030e5..f57533f36ee08714c9e2c57387f887067425691c 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,8 +1,12 @@
 cmake_minimum_required (VERSION 3.1)
-project(zzipbins C)
+project(zziptest C)
 set(VERSION "0.13.69")
 
-if(NOT RELNUM)
+if(NOT CMAKE_BUILD_TYPE) 
+    set(CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
+if(NOT ${RELNUM})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\3" FIXNUM ${VERSION})

diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
index db22330fba162f11f2213ab7362f64ee10131b5b..e15e2fb91cf36666610d163759ec13fee17cf443 100644 (file)
--- a/zzip/CMakeLists.txt
+++ b/zzip/CMakeLists.txt
@@ -177,16 +177,16 @@ target_link_libraries(libzzipmmapped ZLIB::ZLIB )
 target_include_directories (libzzipmmapped PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 endif()
 
-set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip-${RELNUM}")
+set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" RELEASE_POSTFIX "-${RELNUM}")
 SET_TARGET_PROPERTIES(libzzip PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
 
 if(ZZIPFSEEKO)
-set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko-${RELNUM}")
+set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko" RELEASE_POSTFIX "-${RELNUM}")
 SET_TARGET_PROPERTIES(libzzipfseeko PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
 endif()
 
 if(ZZIPMMAPPED)
-set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped-${RELNUM}")
+set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEASE_POSTIFX "-${RELNUM}")
 SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
 endif()
 
@@ -236,21 +236,27 @@ if(ZZIPCOMPAT)
           DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   if(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
     get_target_property(libname libzzip OUTPUT_NAME)
+    get_target_property(librelease libzzip RELEASE_POSTFIX)
     get_target_property(libversion libzzip VERSION)
     set(lib ${CMAKE_SHARED_LIBRARY_PREFIX})
     set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX})
     set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
     if(${libversion} MATCHES "^[0-9].*")
+      message(STATUS "going to relink ${libversion} for ${libname} ${librelease}")
       install(CODE "execute_process(COMMAND bash -c \"set -e
         cd $DESTDIR/${libdir}
-        [ -f ${lib}${libname}${dll}.${libversion} ] || exit 0
+        [ -f ${lib}${libname}${librelease}${dll}.${libversion} ] || exit 0
         echo -n .. Installing: `pwd`
-        ln -sv ${lib}${libname}${dll}.${libversion} ${lib}${libname}${dll}.10
+        ln -sv ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.10
         echo -n .. Installing: `pwd`
-        ln -sv ${lib}${libname}${dll}.${libversion} ${lib}${libname}${dll}.11
+        ln -sv ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.11
         echo -n .. Installing: `pwd`
-        ln -sv ${lib}${libname}${dll}.${libversion} ${lib}${libname}${dll}.12
+        ln -sv ${lib}${libname}${librelease}${dll}.${libversion} ${lib}${libname}${librelease}${dll}.12
         \")")
+    else()
+      message(STATUS "IGNORE to relink ${libversion}") 
     endif()
+  else()
+      message(STATUS "SONAME_CFLAG was ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG}") 
   endif()
 endif()

diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
index 7f698f9f59d0a48ad9b735b57d8a496568791465..f706e344f180f9ac1024cd0a34c876dd646af4c5 100644 (file)
--- a/zzipwrap/CMakeLists.txt
+++ b/zzipwrap/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.1)
 project(zzipwrap C)
 set(VERSION "0.13.69")
 
-if(NOT RELNUM)
+if(NOT ${RELNUM})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\3" FIXNUM ${VERSION})
@@ -42,7 +42,7 @@ add_library(libzzipwrap ${libzzipwrap_SRCS} )
 target_link_libraries(libzzipwrap libzzip ZLIB::ZLIB )
 target_include_directories (libzzipwrap PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${ZZIP_INCLUDE_DIR})
 
-set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap-${RELNUM}")
+set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap" RELEASE_POSTFIX "-${RELNUM}")
 SET_TARGET_PROPERTIES(libzzipwrap PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM})
 
 add_executable(zzipwrap ${zzipwrap_SRCS} )