From ce2bb1e4336db0b645651a38cec3029a51654419 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 12 Mar 2015 12:42:10 +0100 Subject: [PATCH] don't install library dev files until there is an API/ABI policy --- cmake/DbusInterfaceMacros.cmake | 11 ++++++----- core/CMakeLists.txt | 2 +- interfaces/CMakeLists.txt | 18 ++++++++++-------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake index 85a1a75ba..2c49753c7 100644 --- a/cmake/DbusInterfaceMacros.cmake +++ b/cmake/DbusInterfaceMacros.cmake @@ -12,11 +12,12 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu add_custom_target( ${output_xml_file} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} - ) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} - DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} - ) + ) +# don't install until API is stable +# install( +# FILES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} +# DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} +# ) add_dependencies( ${main_project_target} ${output_xml_file} diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index ec7fd7fa3..4a007276c 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -64,4 +64,4 @@ generate_and_install_dbus_interface( OPTIONS -a ) -install(TARGETS kdeconnectcore EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kdeconnectcore EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt index f05d05195..78cc9f201 100644 --- a/interfaces/CMakeLists.txt +++ b/interfaces/CMakeLists.txt @@ -79,12 +79,14 @@ ecm_setup_version( "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KD VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdeconnectinterfaces_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDEConnectConfigVersion.cmake" SOVERSION ${KDECONNECT_VERSION_MAJOR}) - -install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -#Install header files -install(FILES ${libkdeconnect_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kdeconnect COMPONENT Devel) -install(FILES ${libkdeconnect_public_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/KDEConnect COMPONENT Devel) -install(FILES ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfig.cmake - ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfigVersion.cmake - DESTINATION ${LIB_INSTALL_DIR}/cmake/KDEConnect) +install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) +message ("INSTALL_TARGETS_DEFAULT_ARGS" ${INSTALL_TARGETS_DEFAULT_ARGS}) + +## Don't install header files until API/ABI policy is defined +# +# install(FILES ${libkdeconnect_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kdeconnect COMPONENT Devel) +# install(FILES ${libkdeconnect_public_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/KDEConnect COMPONENT Devel) +# install(FILES ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfig.cmake +# ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfigVersion.cmake +# DESTINATION ${LIB_INSTALL_DIR}/cmake/KDEConnect)