tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't install library dev files until there is an API/ABI policy

Browse source
This commit is contained in:
Jonathan Riddell 2015-03-12 12:42:10 +01:00
parent ede7dd0e84
commit ce2bb1e433
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmake/DbusInterfaceMacros.cmake
View file

@ -12,11 +12,12 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu
add_custom_target( add_custom_target(
${output_xml_file} ${output_xml_file}
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file}
) )
install( # don't install until API is stable
FILES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} # install(
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} # FILES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file}
) # DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
# )
add_dependencies( add_dependencies(
${main_project_target} ${main_project_target}
${output_xml_file} ${output_xml_file}

2
core/CMakeLists.txt
View file

@ -64,4 +64,4 @@ generate_and_install_dbus_interface(
OPTIONS -a OPTIONS -a
) )
install(TARGETS kdeconnectcore EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kdeconnectcore EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)

16
interfaces/CMakeLists.txt
View file

@ -80,11 +80,13 @@ ecm_setup_version( "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KD
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDEConnectConfigVersion.cmake" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDEConnectConfigVersion.cmake"
SOVERSION ${KDECONNECT_VERSION_MAJOR}) SOVERSION ${KDECONNECT_VERSION_MAJOR})
install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
message ("INSTALL_TARGETS_DEFAULT_ARGS" ${INSTALL_TARGETS_DEFAULT_ARGS})
#Install header files ## 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 ${libkdeconnect_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kdeconnect COMPONENT Devel)
install(FILES ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfig.cmake # install(FILES ${libkdeconnect_public_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/KDEConnect COMPONENT Devel)
${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfigVersion.cmake # install(FILES ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfig.cmake
DESTINATION ${LIB_INSTALL_DIR}/cmake/KDEConnect) # ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfigVersion.cmake
# DESTINATION ${LIB_INSTALL_DIR}/cmake/KDEConnect)