summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-04-20 09:02:53 +0200
committerMontel Laurent <[email protected]>2016-04-20 09:02:53 +0200
commit4306214cb141247ef32f1bfb205ec73971bf243e (patch)
tree29d09b1bc7a7c397159b9df7de76d209d787d3d3
parentabfd9be10229eef71b7c6ed379cefa196af10522 (diff)
Remove it
-rw-r--r--CMakeLists.txt3
-rw-r--r--cmake/modules/COPYING-CMAKE-SCRIPTS22
-rw-r--r--cmake/modules/FindXsltproc.cmake32
-rw-r--r--kalarm/CMakeLists.txt6
-rw-r--r--knotes/CMakeLists.txt7
5 files changed, 7 insertions, 63 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 099294f..562f96d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,9 +242,6 @@ else()
include_directories(${kdepim_SOURCE_DIR} ${kdepim_BINARY_DIR})
- find_package(Xsltproc)
- set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
-
find_package(KF5AkonadiSearch "5.2.40" CONFIG REQUIRED)
set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
diff --git a/cmake/modules/COPYING-CMAKE-SCRIPTS b/cmake/modules/COPYING-CMAKE-SCRIPTS
deleted file mode 100644
index 4b41776..0000000
--- a/cmake/modules/COPYING-CMAKE-SCRIPTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cmake/modules/FindXsltproc.cmake b/cmake/modules/FindXsltproc.cmake
deleted file mode 100644
index 45b46cf..0000000
--- a/cmake/modules/FindXsltproc.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# Find xsltproc executable and provide a macro to generate D-Bus interfaces.
-#
-# The following variables are defined :
-# XSLTPROC_EXECUTABLE - path to the xsltproc executable
-# Xsltproc_FOUND - true if the program was found
-#
-find_program(XSLTPROC_EXECUTABLE xsltproc DOC "Path to the xsltproc executable")
-mark_as_advanced(XSLTPROC_EXECUTABLE)
-
-if(XSLTPROC_EXECUTABLE)
- set(Xsltproc_FOUND TRUE)
-
- # We depend on kdepimlibs, make sure it's found
- if(NOT DEFINED KF5Akonadi_DATA_DIR)
- find_package(KF5Akonadi REQUIRED)
- endif()
-
-
- # Macro to generate a D-Bus interface description from a KConfigXT file
- macro(kcfg_generate_dbus_interface _kcfg _name)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
- COMMAND ${XSLTPROC_EXECUTABLE} --stringparam interfaceName ${_name}
- ${KF5Akonadi_DATA_DIR}/kcfg2dbus.xsl
- ${_kcfg}
- > ${CMAKE_CURRENT_BINARY_DIR}/${_name}.xml
- DEPENDS ${KF5Akonadi_DATA_DIR}/kcfg2dbus.xsl
- ${_kcfg}
- )
- endmacro()
-endif()
-
diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt
index 50c7e1e..59a841f 100644
--- a/kalarm/CMakeLists.txt
+++ b/kalarm/CMakeLists.txt
@@ -3,7 +3,6 @@ project(kalarm)
if(${CMAKE_SOURCE_DIR} STREQUAL ${kalarm_SOURCE_DIR})
cmake_minimum_required(VERSION 2.8.12)
find_package(ECM 5.20.0 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${kalarm_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
include(ECMInstallIcons)
include(ECMOptionalAddSubdirectory)
@@ -73,13 +72,14 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${kalarm_SOURCE_DIR})
find_package(Boost 1.34.0)
set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
- find_package(Xsltproc)
- set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
if (NOT APPLE)
find_package(X11)
endif()
endif()
+set(CMAKE_MODULE_PATH ${kalarm_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
+find_package(Xsltproc)
+set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
set(KDEPIM_HAVE_X11 ${X11_FOUND})
configure_file(src/config-kalarm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kalarm.h )
diff --git a/knotes/CMakeLists.txt b/knotes/CMakeLists.txt
index ae5b7cb..bfc3141 100644
--- a/knotes/CMakeLists.txt
+++ b/knotes/CMakeLists.txt
@@ -1,9 +1,9 @@
project(knotes)
+
if(${CMAKE_SOURCE_DIR} STREQUAL ${knotes_SOURCE_DIR})
cmake_minimum_required(VERSION 2.8.12)
find_package(ECM 5.20.0 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${knotes_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
include(ECMInstallIcons)
include(ECMOptionalAddSubdirectory)
@@ -74,8 +74,6 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${knotes_SOURCE_DIR})
find_package(KF5AkonadiSearch "5.2.40" CONFIG REQUIRED)
set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
- find_package(Xsltproc)
- set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
find_package(Boost 1.34.0)
set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
@@ -86,6 +84,9 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${knotes_SOURCE_DIR})
set(KDEPIM_HAVE_X11 ${X11_FOUND})
endif()
+set(CMAKE_MODULE_PATH ${knotes_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
+find_package(Xsltproc)
+set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
include_directories(${knotes_SOURCE_DIR} ${knotes_BINARY_DIR})
add_definitions( -DQT_NO_CAST_FROM_ASCII )