From cd45d25874f12acedb0a244978c6c720c3800031 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 9 Jul 2018 09:52:02 +0200 Subject: [PATCH] Fix #104: keychain.h now contains a correct define for keychain version. --- CMakeLists.txt | 8 +++++--- keychain.h => keychain.h.in | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) rename keychain.h => keychain.h.in (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43b87fd..c29207f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,7 @@ list(APPEND qtkeychain_LIBRARIES ${QTCORE_LIBRARIES}) set(qtkeychain_SOURCES keychain.cpp qkeychain_export.h - keychain.h + ${CMAKE_CURRENT_BINARY_DIR}/keychain.h ) add_definitions( -Wall ) @@ -165,7 +165,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID) list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} ) endif() -QT_WRAP_CPP(qtkeychain_MOC_OUTFILES keychain.h keychain_p.h gnomekeyring_p.h) +QT_WRAP_CPP(qtkeychain_MOC_OUTFILES ${CMAKE_CURRENT_BINARY_DIR}/keychain.h keychain_p.h gnomekeyring_p.h) set(qtkeychain_TR_FILES translations/qtkeychain_de.ts @@ -219,7 +219,7 @@ set_target_properties(${QTKEYCHAIN_TARGET_NAME} PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE ) -install(FILES keychain.h ${CMAKE_CURRENT_BINARY_DIR}/qkeychain_export.h +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/keychain.h ${CMAKE_CURRENT_BINARY_DIR}/qkeychain_export.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qt${QTKEYCHAIN_VERSION_INFIX}keychain/ ) @@ -248,6 +248,8 @@ ecm_setup_version("${QTKEYCHAIN_VERSION}" VARIABLE_PREFIX SNORE PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt${QTKEYCHAIN_VERSION_INFIX}KeychainConfigVersion.cmake" SOVERSION ${QTKEYCHAIN_VERSION}) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/keychain.h.in" "${CMAKE_CURRENT_BINARY_DIR}/keychain.h" @ONLY) + if(UNIX AND NOT APPLE AND NOT ANDROID) set(PRI_EXTRA_DEPS "dbus") endif() diff --git a/keychain.h b/keychain.h.in similarity index 99% rename from keychain.h rename to keychain.h.in index 1d7a5fd..d70ef99 100644 --- a/keychain.h +++ b/keychain.h.in @@ -20,7 +20,7 @@ class QSettings; -#define QTKEYCHAIN_VERSION 0x000100 +#define QTKEYCHAIN_VERSION @QTKEYCHAIN_VERSION@ namespace QKeychain {