From 61dae2dbd98c5278f1b958340ee40e8568e7f908 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 25 Nov 2015 08:17:18 +0000 Subject: [PATCH] libkscreen: define LIBKSCREEN_VERSION in temporary config during build Signed-off-by: Ivailo Monev --- libkscreen/CMakeLists.txt | 8 +++++++- libkscreen/backends/xrandr/xrandrconfig.cpp | 2 ++ libkscreen/libkscreen-config.h.cmake | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 libkscreen/libkscreen-config.h.cmake diff --git a/libkscreen/CMakeLists.txt b/libkscreen/CMakeLists.txt index 9ae34fe6..9a27a272 100644 --- a/libkscreen/CMakeLists.txt +++ b/libkscreen/CMakeLists.txt @@ -3,7 +3,13 @@ set(libkscreen_VERSION_MAJOR 1) set(libkscreen_VERSION_MINOR 0) set(libkscreen_VERSION_RELEASE 4) set(libkscreen_VERSION "${libkscreen_VERSION_MAJOR}.${libkscreen_VERSION_MINOR}.${libkscreen_VERSION_RELEASE}") -add_definitions(-DLIBKSCREEN_VERSION="${libkscreen_VERSION}") +set(LIBKSCREEN_VERSION "${libkscreen_VERSION}") + +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/libkscreen-config.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/libkscreen-config.h + @ONLY +) if(POLICY CMP0017) cmake_policy(SET CMP0017 NEW) diff --git a/libkscreen/backends/xrandr/xrandrconfig.cpp b/libkscreen/backends/xrandr/xrandrconfig.cpp index e382e6fe..5f0ef6ac 100644 --- a/libkscreen/backends/xrandr/xrandrconfig.cpp +++ b/libkscreen/backends/xrandr/xrandrconfig.cpp @@ -31,6 +31,8 @@ #include +#include "libkscreen-config.h" + using namespace KScreen; XRandRConfig::XRandRConfig() diff --git a/libkscreen/libkscreen-config.h.cmake b/libkscreen/libkscreen-config.h.cmake new file mode 100644 index 00000000..5cbd6248 --- /dev/null +++ b/libkscreen/libkscreen-config.h.cmake @@ -0,0 +1 @@ +#cmakedefine LIBKSCREEN_VERSION "@LIBKSCREEN_VERSION@"