summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-07 05:09:36 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-07 05:09:36 (GMT)
commit8a323f61f9f9d08cf4b4339825a111d3633323a2 (patch)
tree0a960825b4f0eb8c8d92009c88ac44a544e5c673
parentce7f4f09a2e5d65296cb3782e890bd8f35334ff4 (diff)
Fix install header + soname
-rw-r--r--kaddressbookimportexport/CMakeLists.txt32
-rw-r--r--kaddressbookimportexport/src/CMakeLists.txt76
2 files changed, 51 insertions, 57 deletions
diff --git a/kaddressbookimportexport/CMakeLists.txt b/kaddressbookimportexport/CMakeLists.txt
index 55b781f..0833054 100644
--- a/kaddressbookimportexport/CMakeLists.txt
+++ b/kaddressbookimportexport/CMakeLists.txt
@@ -1,9 +1,9 @@
project(kaddressbookimportexport)
ecm_setup_version(${KDEPIM_APPS_LIB_VERSION} VARIABLE_PREFIX KADDRESSBOOKIMPORTEXPORT
- VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kaddressbookimportexport_version.h"
- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KaddressbookImportExportConfigVersion.cmake"
- SOVERSION 5
-)
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kaddressbookimportexport_version.h"
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KaddressbookImportExportConfigVersion.cmake"
+ SOVERSION 5
+ )
########### Targets ###########
@@ -13,23 +13,23 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5KaddressbookImportExport")
ecm_configure_package_config_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/KF5KaddressbookImportExportConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/KF5KaddressbookImportExportConfig.cmake"
- INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
-)
+ "${CMAKE_CURRENT_SOURCE_DIR}/KF5KaddressbookImportExportConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5KaddressbookImportExportConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+ )
install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/KF5KaddressbookImportExportConfig.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/KF5KaddressbookImportExportConfigVersion.cmake"
- DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
- COMPONENT Devel
-)
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5KaddressbookImportExportConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5KaddressbookImportExportConfigVersion.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+ COMPONENT Devel
+ )
install(EXPORT KF5KaddressbookImportExportTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5KaddressbookImportExportTargets.cmake NAMESPACE KF5::)
install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/kaddressbookimportexport_version.h
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
-)
+ ${CMAKE_CURRENT_BINARY_DIR}/kaddressbookimportexport_version.h
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
+ )
add_subdirectory(src)
diff --git a/kaddressbookimportexport/src/CMakeLists.txt b/kaddressbookimportexport/src/CMakeLists.txt
index 686cadb..7c29a60 100644
--- a/kaddressbookimportexport/src/CMakeLists.txt
+++ b/kaddressbookimportexport/src/CMakeLists.txt
@@ -3,8 +3,8 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
add_definitions(-DTRANSLATION_DOMAIN=\"libkaddressbookimportexport\")
set(kaddressbook_importexport_LIB_SRCS
- kaddressbookimportexportplugin.cpp
-)
+ kaddressbookimportexportplugin.cpp
+ )
add_library(KF5KaddressbookImportExport ${kaddressbook_importexport_LIB_SRCS})
generate_export_header(KF5KaddressbookImportExport BASE_NAME kaddressbook_importexport)
@@ -16,58 +16,52 @@ target_include_directories(KF5KaddressbookImportExport PUBLIC "$<BUILD_INTERFACE
target_link_libraries(KF5KaddressbookImportExport
-PRIVATE
- KF5::ConfigWidgets
- KF5::Service
- KF5::IconThemes
- KF5::I18n
- KF5::PimCommon
-)
+ PRIVATE
+ KF5::ConfigWidgets
+ KF5::Service
+ KF5::IconThemes
+ KF5::I18n
+ KF5::PimCommon
+ )
set_target_properties(KF5KaddressbookImportExport PROPERTIES
- VERSION ${KADDRESSBOOKGRANTLEE_VERSION_STRING}
- SOVERSION ${KADDRESSBOOKGRANTLEE_SOVERSION}
+ VERSION ${KADDRESSBOOKIMPORTEXPORT_VERSION_STRING}
+ SOVERSION ${KADDRESSBOOKIMPORTEXPORT_SOVERSION}
EXPORT_NAME KaddressbookImportExport
-)
+ )
install(TARGETS
KF5KaddressbookImportExport
EXPORT KF5KaddressbookImportExportTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK}
-)
+ )
-# ecm_generate_headers(KaddressbookImportExport_CamelCaseprinting_HEADERS
-# HEADER_NAMES
-# GrantleePrint
-# REQUIRED_HEADERS KaddressbookImportExport_printing_HEADERS
-# RELATIVE printing
-# PREFIX KaddressbookImportExport
-# )
+ecm_generate_headers(KaddressbookImportExport_CamelCase_HEADERS
+ HEADER_NAMES
+ KAddressBookImportExportPlugin
+ REQUIRED_HEADERS KaddressbookImportExport_HEADERS
+ PREFIX KaddressbookImportExport
+ )
ecm_generate_pri_file(BASE_NAME KaddressbookImportExport
LIB_NAME KF5KaddressbookImportExport
- DEPS "Grantlee5" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KaddressbookImportExport
-)
-
-
-# install(FILES
-# ${KaddressbookImportExport_CamelCasewidgets_HEADERS}
-# ${KaddressbookImportExport_CamelCaseformatter_HEADERS}
-# ${KaddressbookImportExport_CamelCaseprinting_HEADERS}
-# DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KaddressbookImportExport
-# COMPONENT Devel
-# )
-
-# install(FILES
-# ${KaddressbookImportExport_HEADERS}
-# ${KaddressbookImportExport_widgets_HEADERS}
-# ${CMAKE_CURRENT_BINARY_DIR}/kaddressbook_grantlee_export.h
-# ${KaddressbookImportExport_formatter_HEADERS}
-# ${KaddressbookImportExport_printing_HEADERS}
-# DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/kaddressbookimportexport
-# COMPONENT Devel
-# )
+ DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KaddressbookImportExport
+ )
+
+
+install(FILES
+ ${KaddressbookImportExport_CamelCase_HEADERS}
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KaddressbookImportExport
+ COMPONENT Devel
+ )
+
+install(FILES
+ ${KaddressbookImportExport_HEADERS}
+ ${CMAKE_CURRENT_BINARY_DIR}/kaddressbook_importexport_export.h
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/kaddressbookimportexport
+ COMPONENT Devel
+ )
install(FILES
${PRI_FILENAME}