From c868b5ea81021ea1e11f1b5cfaf1f3bc306a13f7 Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Sun, 16 Sep 2018 14:36:12 +0200 Subject: [PATCH] set project(VERSION) and reference PROJECT_VERSION after that --- CMakeLists.txt | 11 +---------- SDL/CMakeLists.txt | 15 +++++++-------- bins/CMakeLists.txt | 15 +++++++-------- docs/CMakeLists.txt | 18 ++++++++---------- test/CMakeLists.txt | 15 +++++++-------- zzip/CMakeLists.txt | 19 +++++++++---------- zzipwrap/CMakeLists.txt | 18 +++++++++--------- 7 files changed, 48 insertions(+), 63 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7545a7a..db799f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,19 +1,10 @@ cmake_minimum_required (VERSION 3.1) -project(zziplib C) -set(VERSION "0.13.69") +project(zzip 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}") - ### Path to additional CMake modules # set(CMAKE_MODULE_PATH # ${CMAKE_SOURCE_DIR}/cmake diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt index fc948d1..3697dc2 100644 --- a/SDL/CMakeLists.txt +++ b/SDL/CMakeLists.txt @@ -1,18 +1,17 @@ cmake_minimum_required (VERSION 3.1) -project(zzipsdl C) -set(VERSION "0.13.69") +project(zzipsdl VERSION "0.13.69" LANGUAGES C) 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}) -MESSAGE(STATUS "VERSION ${VERSION} -> RELNUM ${RELNUM}") -MESSAGE(STATUS "VERSION ${VERSION} -> VERNUM ${VERNUM}") -MESSAGE(STATUS "VERSION ${VERSION} -> FIXNUM ${FIXNUM}") +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\3" FIXNUM ${PROJECT_VERSION}) +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> RELNUM ${RELNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> VERNUM ${VERNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> FIXNUM ${FIXNUM}") endif() include ( GNUInstallDirs ) diff --git a/bins/CMakeLists.txt b/bins/CMakeLists.txt index 97f8b77..ef6d2b2 100644 --- a/bins/CMakeLists.txt +++ b/bins/CMakeLists.txt @@ -1,18 +1,17 @@ cmake_minimum_required (VERSION 3.1) -project(zzipbins C) -set(VERSION "0.13.69") +project(zzipbins VERSION "0.13.69" LANGUAGES C) 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}) -MESSAGE(STATUS "VERSION ${VERSION} -> RELNUM ${RELNUM}") -MESSAGE(STATUS "VERSION ${VERSION} -> VERNUM ${VERNUM}") -MESSAGE(STATUS "VERSION ${VERSION} -> FIXNUM ${FIXNUM}") +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\3" FIXNUM ${PROJECT_VERSION}) +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> RELNUM ${RELNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> VERNUM ${VERNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> FIXNUM ${FIXNUM}") endif() include ( GNUInstallDirs ) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 737f4d6..14ec21f 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,14 +1,13 @@ cmake_minimum_required (VERSION 3.1) -project(zzipbins C) -set(VERSION "0.13.69") +project(zzipbins 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}") +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\3" FIXNUM ${PROJECT_VERSION}) +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> RELNUM ${RELNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> VERNUM ${VERNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> FIXNUM ${FIXNUM}") endif() include ( GNUInstallDirs ) @@ -91,7 +90,7 @@ add_custom_command(OUTPUT zzip.pdf add_custom_target(pdf DEPENDS zzip.pdf) endif() -set(docinfo --package="zziplib" --version=${VERSION}) +set(docinfo --package="zziplib" --version=${PROJECT_VERSION}) add_custom_command(OUTPUT zziplib.xml COMMAND ${PY2} ${srcdir}/makedocs.py ${topdir}/zzip/*.c ${docinfo} --onlymainheader=zzip/lib.h --output=zziplib COMMAND ${MV} zziplib.docbook zziplib.xml @@ -139,4 +138,3 @@ install(CODE "execute_process(COMMAND ${BASH} -c \"set -e mkdir -vp $DESTDIR/${mandir} || ls -ld $DESTDIR/${mandir} cd $DESTDIR/${mandir} && tar xf ${CMAKE_CURRENT_BINARY_DIR}/manpages.tar \")") - diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f57533f..2c2c3c1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,18 +1,17 @@ cmake_minimum_required (VERSION 3.1) -project(zziptest C) -set(VERSION "0.13.69") +project(zziptest VERSION "0.13.69" LANGUAGES C) 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}) -MESSAGE(STATUS "VERSION ${VERSION} -> RELNUM ${RELNUM}") -MESSAGE(STATUS "VERSION ${VERSION} -> VERNUM ${VERNUM}") -MESSAGE(STATUS "VERSION ${VERSION} -> FIXNUM ${FIXNUM}") +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\3" FIXNUM ${PROJECT_VERSION}) +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> RELNUM ${RELNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> VERNUM ${VERNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> FIXNUM ${FIXNUM}") endif() include ( GNUInstallDirs ) diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt index 71af7dc..471f729 100644 --- a/zzip/CMakeLists.txt +++ b/zzip/CMakeLists.txt @@ -1,14 +1,13 @@ cmake_minimum_required (VERSION 3.1) -project(zziplib C) -set(VERSION "0.13.69") +project(zziplib VERSION "0.13.69" LANGUAGES C) if(NOT RELNUM) -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}") +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "0.\\3" FIXNUM ${PROJECT_VERSION}) +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> RELNUM ${RELNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> VERNUM ${VERNUM}") +MESSAGE(STATUS "PROJECT_VERSION ${PROJECT_VERSION} -> FIXNUM ${FIXNUM}") # the "0." on FIXNUM is just for compatibility with automake's libtool. endif() @@ -217,9 +216,9 @@ add_custom_command(OUTPUT zziplib.pc COMMAND ${BASH} -c "echo 'libdir=\${prefix}/${CMAKE_INSTALL_LIBDIR}' >> zziplib.pc" COMMAND ${BASH} -c "echo 'includedir=\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}' >> zziplib.pc" COMMAND ${BASH} -c "echo '' >> zziplib.pc" - COMMAND ${BASH} -c "echo 'Name: ${CMAKE_PROJECT_NAME}' >> zziplib.pc" + COMMAND ${BASH} -c "echo 'Name: ${PROJECT_NAME}' >> zziplib.pc" COMMAND ${BASH} -c "echo 'Description: ZZipLib - libZ-based ZIP-access Library with an Easy-to-Use API' >> zziplib.c" - COMMAND ${BASH} -c "echo 'Version: ${VERSION}' >> zziplib.pc" + COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> zziplib.pc" COMMAND ${BASH} -c "echo 'Requires: zlib' >> zziplib.pc" COMMAND ${BASH} -c "echo 'Libs: -L\${libdir} -lzzip' >> zziplib.pc" COMMAND ${BASH} -c "echo 'Cflags: -I\${includedir}' >> zziplib.pc" diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt index 3fac24a..5861b35 100644 --- a/zzipwrap/CMakeLists.txt +++ b/zzipwrap/CMakeLists.txt @@ -1,14 +1,14 @@ cmake_minimum_required (VERSION 3.1) -project(zzipwrap C) -set(VERSION "0.13.69") +project(zzipwrap VERSION "0.13.69" LANGUAGES C) -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}") +if(NOT RELNUM) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\1" RELNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "\\2" VERNUM ${PROJECT_VERSION}) +string(REGEX REPLACE "([^.]+)[.]([^.]+)[.]([^.]+)" "0.\\3" FIXNUM ${PROJECT_VERSION}) +MESSAGE(STATUS "VERSION ${PROJECT_VERSION} -> RELNUM ${RELNUM}") +MESSAGE(STATUS "VERSION ${PROJECT_VERSION} -> VERNUM ${VERNUM}") +MESSAGE(STATUS "VERSION ${PROJECT_VERSION} -> FIXNUM ${FIXNUM}") +# the "0." on FIXNUM is just for compatibility with automake's libtool. endif() include ( CheckIncludeFiles ) -- 2.40.0