Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "generic: install export files in modern location"

Browse source 
This reverts commit 43f704e26a.
This commit is contained in:
Ivailo Monev 2015-11-06 16:15:11 +02:00
parent 5b1c0c850c
commit ea3bc85252
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -285,14 +285,17 @@ configure_file(KDE4Version.cmake ${CMAKE_CURRENT_BINARY_DIR}/KDE4Version.cmake @
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h FILES ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h
DESTINATION ${INCLUDE_INSTALL_DIR} DESTINATION
${INCLUDE_INSTALL_DIR}
) )
# the following will be the correct locations once cmake has the improved
# FIND_PACKAGE(): ${SHARE_INSTALL_PREFIX}/cmake/KDE4)
install( install(
FILES FILES
${CMAKE_CURRENT_BINARY_DIR}/KDE4Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/KDE4Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/KDE4Version.cmake ${CMAKE_CURRENT_BINARY_DIR}/KDE4Version.cmake
DESTINATION ${LIB_INSTALL_DIR}/cmake/KDE4 DESTINATION ${DATA_INSTALL_DIR}/cmake/modules
) )
# run a script before installing the exports files which deletes previously # run a script before installing the exports files which deletes previously
@ -302,20 +305,20 @@ install(
# targets with different names. # targets with different names.
install( install(
CODE "set(EXPORT_FILES KDELibs4LibraryTargets.cmake KDELibs4ToolsTargets.cmake)" CODE "set(EXPORT_FILES KDELibs4LibraryTargets.cmake KDELibs4ToolsTargets.cmake)"
CODE "set(EXPORT_INSTALL_DIR \"${LIB_INSTALL_DIR}/cmake/KDE4\")" CODE "set(EXPORT_INSTALL_DIR \"${DATA_INSTALL_DIR}/cmake/modules\")"
SCRIPT "${CMAKE_SOURCE_DIR}/cmake/modules/check_installed_exports_file.cmake" SCRIPT "${CMAKE_SOURCE_DIR}/cmake/modules/check_installed_exports_file.cmake"
) )
install( install(
EXPORT kdelibsLibraryTargets EXPORT kdelibsLibraryTargets
NAMESPACE ${KDE4_TARGET_PREFIX} NAMESPACE ${KDE4_TARGET_PREFIX}
FILE KDELibs4LibraryTargets.cmake FILE KDELibs4LibraryTargets.cmake
DESTINATION ${LIB_INSTALL_DIR}/cmake/KDE4 DESTINATION ${DATA_INSTALL_DIR}/cmake/modules
) )
install( install(
EXPORT kdelibsToolsTargets EXPORT kdelibsToolsTargets
NAMESPACE ${KDE4_TARGET_PREFIX} NAMESPACE ${KDE4_TARGET_PREFIX}
FILE KDELibs4ToolsTargets.cmake FILE KDELibs4ToolsTargets.cmake
DESTINATION ${LIB_INSTALL_DIR}/cmake/KDE4 DESTINATION ${DATA_INSTALL_DIR}/cmake/modules
) )
feature_summary(WHAT ALL feature_summary(WHAT ALL