diff --git a/bluedevil/libbluedevil/bluedevil/CMakeLists.txt b/bluedevil/libbluedevil/bluedevil/CMakeLists.txt index d2a4441e..8b6725ce 100644 --- a/bluedevil/libbluedevil/bluedevil/CMakeLists.txt +++ b/bluedevil/libbluedevil/bluedevil/CMakeLists.txt @@ -45,6 +45,3 @@ install( ${CMAKE_CURRENT_BINARY_DIR}/bluedevil_export.h DESTINATION include/bluedevil ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bluedevil.pc.in ${CMAKE_CURRENT_BINARY_DIR}/bluedevil.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluedevil.pc DESTINATION ${KDE4_LIB_INSTALL_DIR}/pkgconfig) diff --git a/bluedevil/libbluedevil/bluedevil/bluedevil.pc.in b/bluedevil/libbluedevil/bluedevil/bluedevil.pc.in deleted file mode 100644 index d6a595d5..00000000 --- a/bluedevil/libbluedevil/bluedevil/bluedevil.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@KDE4_LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include - -Name: bluedevil -Description: BlueDevil library -Version: @VERSION@ - -Libs: -L${libdir} -lbluedevil -Cflags: -I${includedir} diff --git a/kompare/libkomparediff2/CMakeLists.txt b/kompare/libkomparediff2/CMakeLists.txt index 293e8ad8..7021bc01 100644 --- a/kompare/libkomparediff2/CMakeLists.txt +++ b/kompare/libkomparediff2/CMakeLists.txt @@ -1,7 +1,11 @@ cmake_minimum_required(VERSION 2.6) project(LibKompareDiff2) -include_directories (${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) +include_directories( + ${PROJECT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${KDE4_INCLUDES} +) set(komparediff2_SRCS kompareprocess.cpp @@ -36,7 +40,10 @@ set_target_properties(komparediff2 PROPERTIES generate_export_header(komparediff2) -install(TARGETS komparediff2 EXPORT LibKompareDiff2Targets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS komparediff2 + EXPORT LibKompareDiff2Targets ${INSTALL_TARGETS_DEFAULT_ARGS} +) if(ENABLE_TESTING) add_subdirectory(tests) @@ -54,18 +61,6 @@ install( kompare.h diffhunk.h ${CMAKE_CURRENT_BINARY_DIR}/komparediff2_export.h - DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libkomparediff2 COMPONENT Devel + DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/libkomparediff2 + COMPONENT Devel ) - -# Config.cmake file. -configure_file( "${PROJECT_SOURCE_DIR}/LibKompareDiff2Config.cmake.in" "${CMAKE_BINARY_DIR}/LibKompareDiff2Config.cmake" @ONLY ) - -set(_LibKompareDiff2_CONFIG_DEST "${KDE4_LIB_INSTALL_DIR}/cmake/libkomparediff2") - -install( FILES - "${CMAKE_BINARY_DIR}/LibKompareDiff2Config.cmake" - DESTINATION "${_LibKompareDiff2_CONFIG_DEST}" ) -install( EXPORT LibKompareDiff2Targets - DESTINATION "${_LibKompareDiff2_CONFIG_DEST}" - NAMESPACE LibKompareDiff2Import__ - FILE LibKompareDiff2Targets.cmake ) diff --git a/kompare/libkomparediff2/LibKompareDiff2Config.cmake.in b/kompare/libkomparediff2/LibKompareDiff2Config.cmake.in deleted file mode 100644 index 3f2facee..00000000 --- a/kompare/libkomparediff2/LibKompareDiff2Config.cmake.in +++ /dev/null @@ -1,32 +0,0 @@ -######################################################################### -# -# LibKompareDiff2 Configuration File -# -# This file sets various CMake Variables -# -# LIBKOMPAREDIFF2_INCLUDE_DIR - The Include Directory for the LIBKOMPAREDIFF2 library -# LIBKOMPAREDIFF2_LIBRARIES - the libkomparediff2 library -# -# Copyright 2008 Andreas Pakulat -# Copyright 2010 Niko Sams -# Copyright 2013 Jeremy Whiting -# Redistribution and use is allowed according to the terms of the BSD license. -###################################################################### - -get_filename_component(_LIBKOMPAREDIFF2_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - -if(NOT WIN32) -# This is needed on non-win32 platforms, as lib-install-dir might be in a -# totally different prefix than include-install-dir. So instead hardcode the -# absolute path during buildtime -set( LIBKOMPAREDIFF2_INCLUDE_DIR "@KDE4_INCLUDE_INSTALL_DIR@/libkomparediff2" ) - -else(NOT WIN32) - -set( LIBKOMPAREDIFF2_INCLUDE_DIR "${_LIBKOMPAREDIFF2_CURRENT_DIR}/../../../include/libkomparediff2" ) - -endif(NOT WIN32) - -include("${CMAKE_CURRENT_LIST_DIR}/LibKompareDiff2Targets.cmake") -set( LIBKOMPAREDIFF2_LIBRARIES LibKompareDiff2Import__komparediff2) - diff --git a/libksane/cmake/templates/KSaneConfig.cmake.in b/libksane/cmake/templates/KSaneConfig.cmake.in deleted file mode 100644 index 292b4d07..00000000 --- a/libksane/cmake/templates/KSaneConfig.cmake.in +++ /dev/null @@ -1,10 +0,0 @@ -GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - -find_library(KSANE_LIBRARY NAMES ksane HINTS ${_IMPORT_PREFIX}/lib NO_DEFAULT_PATH) -find_path(KSANE_INCLUDE_DIR NAMES libksane/ksane.h HINTS ${_IMPORT_PREFIX}/include NO_DEFAULT_PATH) -SET(KSANE_LIBRARY "${KSANE_LIBRARY}" CACHE FILEPATH "KSane image scanning library") -SET(KSANE_INCLUDE_DIR "${KSANE_INCLUDE_DIR}" CACHE PATH "Include path for KSane library") -SET(KSANE_FOUND TRUE) diff --git a/libksane/cmake/templates/libksane.pc.cmake.in b/libksane/cmake/templates/libksane.pc.cmake.in deleted file mode 100644 index c238c656..00000000 --- a/libksane/cmake/templates/libksane.pc.cmake.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${KDE4_BIN_INSTALL_DIR} -libdir=${KDE4_LIB_INSTALL_DIR} -includedir=${KDE4_INCLUDE_INSTALL_DIR} - -Name: libksane -Description: libksane is a C++ library for SANE interface to control flat scanners. -URL: http://www.digikam.org -Requires: -Version: ${KSANE_LIB_VERSION_STRING} -Libs: -L${KDE4_LIB_INSTALL_DIR} -lksane -Cflags: -I${KDE4_INCLUDE_INSTALL_DIR} diff --git a/libksane/libksane/CMakeLists.txt b/libksane/libksane/CMakeLists.txt index da19b91c..dcb6a848 100644 --- a/libksane/libksane/CMakeLists.txt +++ b/libksane/libksane/CMakeLists.txt @@ -58,12 +58,6 @@ ENDIF() INSTALL(TARGETS ksane ${INSTALL_TARGETS_DEFAULT_ARGS} ) -CONFIGURE_FILE( - ../cmake/templates/KSaneConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake - @ONLY -) - INSTALL( FILES ksane.h @@ -73,22 +67,5 @@ INSTALL( COMPONENT Devel ) -CONFIGURE_FILE( - ${PROJECT_SOURCE_DIR}/cmake/templates/libksane.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc -) -INSTALL( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc - DESTINATION ${KDE4_LIB_INSTALL_DIR}/pkgconfig -) - -# Install find cmake script to the system for client applications. - -INSTALL( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/KSaneConfig.cmake - DESTINATION ${KDE4_LIB_INSTALL_DIR}/cmake/KSane -) - KDE4_INSTALL_ICONS(${KDE4_ICON_INSTALL_DIR}) diff --git a/libktorrent/cmake/modules/CMakeLists.txt b/libktorrent/cmake/modules/CMakeLists.txt index b135b139..1fd01c98 100644 --- a/libktorrent/cmake/modules/CMakeLists.txt +++ b/libktorrent/cmake/modules/CMakeLists.txt @@ -1,3 +1,4 @@ -set(module_install_dir ${KDE4_DATA_INSTALL_DIR}/cmake/modules ) - -install(FILES FindKTorrent.cmake DESTINATION ${module_install_dir}) +install( + FILES FindKTorrent.cmake + DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/modules +)