From 7aeef0fef9d506bec53be5b9e660e41bae9b49c0 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Tue, 27 Oct 2020 13:51:35 +0100 Subject: Fix broken version header packaging for source packages --- cmake/InstallVersionFile.cmake.in | 8 -------- cmake/PostVersionPackaging.cmake | 9 +++++++++ cmake/PreVersionPackaging.cmake | 11 +++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 cmake/InstallVersionFile.cmake.in create mode 100644 cmake/PostVersionPackaging.cmake create mode 100644 cmake/PreVersionPackaging.cmake (limited to 'cmake') diff --git a/cmake/InstallVersionFile.cmake.in b/cmake/InstallVersionFile.cmake.in deleted file mode 100644 index 8121c25..0000000 --- a/cmake/InstallVersionFile.cmake.in +++ /dev/null @@ -1,8 +0,0 @@ -# -# AUTOGENERATED: DO NOT EDIT THIS FILE -# - -if(CPACK_SOURCE_INSTALLED_DIRECTORIES AND EXISTS "@INCLUDE_VERSION_HEADER_GENERATE@") - file(INSTALL "@INCLUDE_VERSION_HEADER_GENERATE@" - DESTINATION "@INCLUDE_VERSION_HEADER_GENERATE_PREFIX@") -endif(CPACK_SOURCE_INSTALLED_DIRECTORIES AND EXISTS "@INCLUDE_VERSION_HEADER_GENERATE@") diff --git a/cmake/PostVersionPackaging.cmake b/cmake/PostVersionPackaging.cmake new file mode 100644 index 0000000..877cd12 --- /dev/null +++ b/cmake/PostVersionPackaging.cmake @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2020 Manuel Bentele +# + +if(EXISTS ${VERSION_HEADER_INPUT_FILE}) + # remove version.h if generated version.h is available from a Git build + file(REMOVE ${VERSION_HEADER_OUTPUT_FILE}) +endif(EXISTS ${VERSION_HEADER_INPUT_FILE}) diff --git a/cmake/PreVersionPackaging.cmake b/cmake/PreVersionPackaging.cmake new file mode 100644 index 0000000..e960155 --- /dev/null +++ b/cmake/PreVersionPackaging.cmake @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2020 Manuel Bentele +# + +if(EXISTS ${VERSION_HEADER_INPUT_FILE}) + # copy generated version.h into the source repository for packaging purposes + get_filename_component(VERSION_HEADER_OUTPUT_FILE_PATH ${VERSION_HEADER_OUTPUT_FILE} PATH) + file(COPY ${VERSION_HEADER_INPUT_FILE} + DESTINATION ${VERSION_HEADER_OUTPUT_FILE_PATH}) +endif(EXISTS ${VERSION_HEADER_INPUT_FILE}) -- cgit v1.2.3-55-g7522