[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepimlibs/frameworks] /: Fix generate targets
From: Montel Laurent <montel () kde ! org>
Date: 2014-04-25 11:30:04
Message-ID: E1WdeKS-0003rs-9N () scm ! kde ! org
[Download RAW message or body]
Git commit becd5f10b76f6a572b800f5941c9c9d2d551808d by Montel Laurent.
Committed on 25/04/2014 at 11:03.
Pushed by mlaurent into branch 'frameworks'.
Fix generate targets
M +1 -1 CMakeLists.txt
M +1 -1 akonadi/src/core/CMakeLists.txt
M +6 -2 gpgme++/CMakeLists.txt
M +10 -10 gpgme++/src/CMakeLists.txt
M +2 -3 qgpgme/CMakeLists.txt
M +2 -3 qgpgme/src/CMakeLists.txt
http://commits.kde.org/kdepimlibs/becd5f10b76f6a572b800f5941c9c9d2d551808d
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a499395..7a775f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ add_subdirectory(kblog)
add_subdirectory(microblog)
add_subdirectory(kalarmcal)
add_subdirectory(gpgme++)
-#add_subdirectory(qgpgme)
+add_subdirectory(qgpgme)
add_subdirectory(kioslave)
add_subdirectory(kldap)
add_subdirectory(ktnef)
diff --git a/akonadi/src/core/CMakeLists.txt b/akonadi/src/core/CMakeLists.=
txt
index 9886ea0..ee76c83 100644
--- a/akonadi/src/core/CMakeLists.txt
+++ b/akonadi/src/core/CMakeLists.txt
@@ -144,7 +144,7 @@ ecm_generate_headers(AkonadiCore_models_HEADERS
CollectionFilterProxyModel
CollectionModel
CollectionStatisticsModel
- EntityMimeTypefilterModel
+ EntityMimeTypeFilterModel
EntityOrderProxyModel
EntityRightsFilterModel
EntityTreeModel
diff --git a/gpgme++/CMakeLists.txt b/gpgme++/CMakeLists.txt
index b33bd03..3908cf1 100644
--- a/gpgme++/CMakeLists.txt
+++ b/gpgme++/CMakeLists.txt
@@ -56,8 +56,12 @@ install(FILES
COMPONENT Devel
)
=
-#reactivate ti
-#install(EXPORT KF5QGpgmeTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" =
FILE KF5QGpgmeTargets.cmake NAMESPACE KF5::)
+install(EXPORT
+ KF5GpgmeppTargets
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+ FILE KF5GpgmeppTargets.cmake
+ NAMESPACE KF5::)
+
=
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/gpgmepp_version.h
diff --git a/gpgme++/src/CMakeLists.txt b/gpgme++/src/CMakeLists.txt
index 1361521..9e9a9b9 100644
--- a/gpgme++/src/CMakeLists.txt
+++ b/gpgme++/src/CMakeLists.txt
@@ -62,14 +62,14 @@ if ( GPGME_VANILLA_FOUND )
)
=
target_include_directories(KF5Gpgmepp INTERFACE "$<INSTALL_INTERFACE:${=
INCLUDE_INSTALL_DIR}/gpgme++>")
- target_include_directories(KF5Gpgmepp PUBLIC "$<BUILD_INTERFACE:${Gpgme=
_SOURCE_DIR}/src;${Gpgme_BINARY_DIR}/src>")
+ target_include_directories(KF5Gpgmepp PUBLIC "$<BUILD_INTERFACE:${Gpgme=
pp_SOURCE_DIR}/src;${Gpgmepp_BINARY_DIR}/src>")
=
set_target_properties(KF5Gpgmepp PROPERTIES
VERSION ${GPGMEPP_VERSION_STRING}
SOVERSION ${GPGMEPP_SOVERSION}
EXPORT_NAME Gpgmepp
)
- install(TARGETS KF5Gpgmepp EXPORT KF5GpgmeTargets ${INSTALL_TARGETS_DEF=
AULT_ARGS})
+ install(TARGETS KF5Gpgmepp EXPORT KF5GpgmeppTargets ${INSTALL_TARGETS_D=
EFAULT_ARGS})
=
endif()
=
@@ -86,14 +86,14 @@ if ( GPGME_GLIB_FOUND )
)
=
target_include_directories(KF5Gpgmepp-glib INTERFACE "$<INSTALL_INTERFA=
CE:${INCLUDE_INSTALL_DIR}/gpgme++>")
- target_include_directories(KF5Gpgmepp-glib PUBLIC "$<BUILD_INTERFACE:${=
Gpgme_SOURCE_DIR}/src;${Gpgme_BINARY_DIR}/src>")
+ target_include_directories(KF5Gpgmepp-glib PUBLIC "$<BUILD_INTERFACE:${=
Gpgmepp_SOURCE_DIR}/src;${Gpgmepp_BINARY_DIR}/src>")
=
set_target_properties(KF5Gpgmepp-glib PROPERTIES
VERSION ${GPGMEPP_VERSION_STRING}
SOVERSION ${GPGMEPP_SOVERSION}
EXPORT_NAME Gpgmepp-glib
)
- install(TARGETS KF5Gpgmepp-glib EXPORT KF5Gpgme-glibTargets ${INSTALL_T=
ARGETS_DEFAULT_ARGS})
+ install(TARGETS KF5Gpgmepp-glib EXPORT KF5GpgmeppTargets ${INSTALL_TARG=
ETS_DEFAULT_ARGS})
endif()
=
=
@@ -110,7 +110,7 @@ if ( GPGME_QT_FOUND )
)
=
target_include_directories(KF5Gpgmepp-qt INTERFACE "$<INSTALL_INTERFACE=
:${INCLUDE_INSTALL_DIR}/gpgme++>")
- target_include_directories(KF5Gpgmepp-qt PUBLIC "$<BUILD_INTERFACE:${Gp=
gme_SOURCE_DIR}/src;${Gpgme_BINARY_DIR}/src>")
+ target_include_directories(KF5Gpgmepp-qt PUBLIC "$<BUILD_INTERFACE:${Gp=
gmepp_SOURCE_DIR}/src;${Gpgmepp_BINARY_DIR}/src>")
=
if(WIN32)
target_link_libraries( gpgmepp-qt ${GPGME_VANILLA_LIBRARIES} )
@@ -121,7 +121,7 @@ if ( GPGME_QT_FOUND )
SOVERSION ${GPGMEPP_SOVERSION}
EXPORT_NAME Gpgmepp-qt
)
- install(TARGETS KF5Gpgmepp-qt EXPORT KF5Gpgme-qtTargets ${INSTALL_TARGE=
TS_DEFAULT_ARGS})
+ install(TARGETS KF5Gpgmepp-qt EXPORT KF5GpgmeppTargets ${INSTALL_TARGET=
S_DEFAULT_ARGS})
endif()
=
=
@@ -138,14 +138,14 @@ if ( GPGME_PTHREAD_FOUND )
)
=
target_include_directories(KF5Gpgmepp-pthread INTERFACE "$<INSTALL_INTE=
RFACE:${INCLUDE_INSTALL_DIR}/gpgme++>")
- target_include_directories(KF5Gpgmepp-pthread PUBLIC "$<BUILD_INTERFACE=
:${Gpgme_SOURCE_DIR}/src;${Gpgme_BINARY_DIR}/src>")
+ target_include_directories(KF5Gpgmepp-pthread PUBLIC "$<BUILD_INTERFACE=
:${Gpgmepp_SOURCE_DIR}/src;${Gpgmepp_BINARY_DIR}/src>")
=
set_target_properties(KF5Gpgmepp-pthread PROPERTIES
VERSION ${GPGMEPP_VERSION_STRING}
SOVERSION ${GPGMEPP_SOVERSION}
EXPORT_NAME Gpgmepp-pthread
)
- install(TARGETS KF5Gpgmepp-pthread EXPORT KF5Gpgme-pthreadTargets ${INS=
TALL_TARGETS_DEFAULT_ARGS})
+ install(TARGETS KF5Gpgmepp-pthread EXPORT KF5GpgmeppTargets ${INSTALL_T=
ARGETS_DEFAULT_ARGS})
=
endif()
=
@@ -162,14 +162,14 @@ if ( GPGME_PTH_FOUND )
)
=
target_include_directories(KF5Gpgmepp-pth INTERFACE "$<INSTALL_INTERFAC=
E:${INCLUDE_INSTALL_DIR}/gpgme++>")
- target_include_directories(KF5Gpgmepp-pth PUBLIC "$<BUILD_INTERFACE:${G=
pgme_SOURCE_DIR}/src;${Gpgme_BINARY_DIR}/src>")
+ target_include_directories(KF5Gpgmepp-pth PUBLIC "$<BUILD_INTERFACE:${G=
pgmepp_SOURCE_DIR}/src;${Gpgmepp_BINARY_DIR}/src>")
=
set_target_properties(KF5Gpgmepp-pth PROPERTIES
VERSION ${GPGMEPP_VERSION_STRING}
SOVERSION ${GPGMEPP_SOVERSION}
EXPORT_NAME Gpgmepp-pth
)
- install(TARGETS KF5Gpgmepp-pth EXPORT KF5Gpgme-pthTargets ${INSTALL_TAR=
GETS_DEFAULT_ARGS})
+ install(TARGETS KF5Gpgmepp-pth EXPORT KF5GpgmeppTargets ${INSTALL_TARGE=
TS_DEFAULT_ARGS})
endif()
=
# this writes way too much, but do we care?
diff --git a/qgpgme/CMakeLists.txt b/qgpgme/CMakeLists.txt
index a0ce8d0..e5eefb3 100644
--- a/qgpgme/CMakeLists.txt
+++ b/qgpgme/CMakeLists.txt
@@ -37,7 +37,7 @@ set_package_properties(Gpgme PROPERTIES
########### Find packages ###########
find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
=
-if(${CMAKE_SOURCE_DIR} STREQUAL ${Akonadi-KMime_SOURCE_DIR})
+if("${CMAKE_SOURCE_DIR}" STREQUAL "${QGpgme_SOURCE_DIR}")
find_package(KF5Gpgmepp CONFIG REQUIRED)
endif()
=
@@ -60,8 +60,7 @@ install(FILES
COMPONENT Devel
)
=
-#reactivate ti
-#install(EXPORT KF5QGpgmeTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" =
FILE KF5QGpgmeTargets.cmake NAMESPACE KF5::)
+install(EXPORT KF5QGpgmeTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" F=
ILE KF5QGpgmeTargets.cmake NAMESPACE KF5::)
=
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/qgpgme_version.h
diff --git a/qgpgme/src/CMakeLists.txt b/qgpgme/src/CMakeLists.txt
index fe854e7..293c0b0 100644
--- a/qgpgme/src/CMakeLists.txt
+++ b/qgpgme/src/CMakeLists.txt
@@ -42,7 +42,7 @@ if ( _any_gpgme_found )
generate_export_header(KF5QGpgme BASE_NAME qgpgme)
=
add_library(KF5::QGpgme ALIAS KF5QGpgme)
-
+ =
target_link_libraries(KF5QGpgme
PUBLIC
Qt5::Core
@@ -64,8 +64,7 @@ if ( _any_gpgme_found )
EXPORT_NAME QGpgme
)
=
- #REactivate it
- #install(TARGETS KF5QGpgme EXPORT KF5QGpgmeTargets ${INSTALL_TARGETS_DE=
FAULT_ARGS})
+ install(TARGETS KF5QGpgme EXPORT KF5QGpgmeTargets ${INSTALL_TARGETS_DEF=
AULT_ARGS})
=
install( FILES
${CMAKE_CURRENT_BINARY_DIR}/qgpgme_export.h
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic