Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #104: keychain.h now contains a correct define for keychain version. #113

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #104: keychain.h now contains a correct define for keychain version. #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/
)

Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion keychain.h → keychain.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

class QSettings;

#define QTKEYCHAIN_VERSION 0x000100
#define QTKEYCHAIN_VERSION @QTKEYCHAIN_VERSION@

namespace QKeychain {

Expand Down