- cleanup

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 558b847dce048f1d07f4be3c6d228993333327ea..737f4d62656b003c73c459e112b60f006ea46ef7 100644 (file)
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -30,6 +30,11 @@ find_program(XMLTO xmlto)
 set(EXEEXT ${CMAKE_EXECUTABLE_SUFFIX})
 set(README ${CMAKE_SOURCE_DIR}/README)
 
+set(topdir ${CMAKE_SOURCE_DIR})
+set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
+set(outdir ${CMAKE_CURRENT_BINARY_DIR})
+set(PY2 ${PYTHON_EXECUTABLE})
+
 # targets ########################################################
 set(doc_FILES README.MSVC6 README.SDL COPYING.MPL COPYING.LIB COPYING.ZLIB
             zziplib.html zzipmmapped.html zzipfseeko.html)
@@ -49,11 +54,6 @@ set(zzipdoc_FILES makedocs.py          zzipdoc/__init__.py
     zzipdoc/functionprototype.py      zzipdoc/htmldocument.py
                                       zzipdoc/docbookdocument.py)
 
-set(topdir ${CMAKE_SOURCE_DIR})
-set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
-set(outdir ${CMAKE_CURRENT_BINARY_DIR})
-set(PY2 ${PYTHON_EXECUTABLE})
-
 add_custom_command(OUTPUT changes.htm
     COMMAND ${BASH} -c "E=changes.htm \
     ; echo '<pre>' > $E ; cat ${topdir}/ChangeLog \

diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
index 4f7ae6ef358ab444e7e9fcb43ce8f58d80650afb..7f698f9f59d0a48ad9b735b57d8a496568791465 100644 (file)
--- a/zzipwrap/CMakeLists.txt
+++ b/zzipwrap/CMakeLists.txt
@@ -2,12 +2,14 @@ cmake_minimum_required (VERSION 3.1)
 project(zzipwrap C)
 set(VERSION "0.13.69")
 
+if(NOT RELNUM)
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${VERSION})
 string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\3" FIXNUM ${VERSION})
 MESSAGE(STATUS "VERSION ${VERSION} -> RELNUM ${RELNUM}")
 MESSAGE(STATUS "VERSION ${VERSION} -> VERNUM ${VERNUM}")
 MESSAGE(STATUS "VERSION ${VERSION} -> FIXNUM ${FIXNUM}")
+endif()
 
 include ( CheckIncludeFiles )
 include ( GNUInstallDirs )