From 270b48633a4d8de641907a2053099eeb9fb246a1 Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Fri, 1 Jan 2021 16:32:09 +0100
Subject: [PATCH] OSX: Fix version in Info.plist
Fixes #1552
---
CMakeLists.txt | 5 ++++-
src/CMakeLists.txt | 4 ++++
version.cmake | 4 ----
version_header.cmake | 2 ++
4 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 version_header.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2af673ed..bcb6e6156 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,6 +134,9 @@ if(WITH_TESTS)
list(APPEND copyq_LIBRARIES Qt5::Test)
endif()
+include(version.cmake)
+message(STATUS "Building CopyQ version ${copyq_version}.")
+
# Generate version.h from current git commit if available.
add_custom_target(
generate_version_header
@@ -141,7 +144,7 @@ add_custom_target(
COMMAND ${CMAKE_COMMAND}
-D INPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/src/common/version.h.in
-D OUTPUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/src/common/version.h
- -P ${CMAKE_CURRENT_SOURCE_DIR}/version.cmake
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/version_header.cmake
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/src/common/version.h
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba279163e..34790eea9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -60,6 +60,10 @@ set(copyq_COMPILE
${copyq_QM}
)
+if (NOT copyq_version)
+ message(FATAL_ERROR "Application version is unset")
+endif()
+
if (NOT APPLE)
add_executable(${COPYQ_EXECUTABLE_NAME} ${copyq_COMPILE})
else()
diff --git a/version.cmake b/version.cmake
index 628c28b99..8a786f7d1 100644
--- a/version.cmake
+++ b/version.cmake
@@ -20,7 +20,3 @@ else()
endif()
endif()
endif()
-
-message(STATUS "Building CopyQ version ${copyq_version}.")
-
-configure_file("${INPUT_FILE}" "${OUTPUT_FILE}")
diff --git a/version_header.cmake b/version_header.cmake
new file mode 100644
index 000000000..0229f0d63
--- /dev/null
+++ b/version_header.cmake
@@ -0,0 +1,2 @@
+include(version.cmake)
+configure_file("${INPUT_FILE}" "${OUTPUT_FILE}")
--
GitLab