[qcustomplot] 02/05: Move cmake-files into usr/lib/cmake/QCustomplot.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository qcustomplot.

commit faf18824c5bc051081866324f03967c1e5ce33c6
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Jan 13 10:41:09 2016 +0100

    Move cmake-files into usr/lib/cmake/QCustomplot.
---
 debian/libqcustomplot-dev.install      |  2 +-
 debian/libqcustomplot-dev.links        |  2 --
 debian/patches/01_Add_CMakeLists.patch | 52 +++++++++++++++++-----------------
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/debian/libqcustomplot-dev.install b/debian/libqcustomplot-dev.install
index e155401..3f0542f 100644
--- a/debian/libqcustomplot-dev.install
+++ b/debian/libqcustomplot-dev.install
@@ -1,3 +1,3 @@
 usr/include
 usr/lib/*/libqcustomplot.so
-usr/share
+usr/lib/*/cmake
diff --git a/debian/libqcustomplot-dev.links b/debian/libqcustomplot-dev.links
deleted file mode 100644
index 9d3876e..0000000
--- a/debian/libqcustomplot-dev.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/cmake-2.8/Modules/FindQCustomPlot.cmake usr/share/cmake-3.0/Modules/FindQCustomPlot.cmake
-usr/share/cmake-2.8/Modules/FindQCustomPlot.cmake usr/share/cmake-3.2/Modules/FindQCustomPlot.cmake
diff --git a/debian/patches/01_Add_CMakeLists.patch b/debian/patches/01_Add_CMakeLists.patch
index eebc30c..dbce324 100644
--- a/debian/patches/01_Add_CMakeLists.patch
+++ b/debian/patches/01_Add_CMakeLists.patch
@@ -12,7 +12,7 @@ Index: qcustomplot/CMakeLists.txt
 +
 +SET(Q_MAJOR_VERSION "1")
 +SET(Q_MINOR_VERSION "3")
-+SET(Q_PATCH_VERSION "1")
++SET(Q_PATCH_VERSION "2")
 +
 +INCLUDE(GNUInstallDirs)
 +FIND_PACKAGE(Qt5Widgets REQUIRED)
@@ -35,31 +35,7 @@ Index: qcustomplot/CMakeLists.txt
 +
 +INSTALL(TARGETS qcustomplot DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 +INSTALL(FILES qcustomplot.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+INSTALL(FILES cmake/FindQCustomPlot.cmake DESTINATION "/usr/share/cmake-2.8/Modules")
-Index: qcustomplot/cmake/FindQCustomPlot.cmake
-===================================================================
---- /dev/null
-+++ qcustomplot/cmake/FindQCustomPlot.cmake
-@@ -0,0 +1,19 @@
-+# Try to find the QCustomPlot librairies
-+#  QCustomPlot_FOUND - system has QCustomPlot lib
-+#  QCustomPlot_INCLUDE_DIR - the GMP include directory
-+#  QCustomPlot_LIBRARIES - Libraries needed to use QCustomPlot
-+
-+# Copyright (c) 2013, Anton Gladky <gladk at debian.org>
-+#
-+# Redistribution and use is allowed according to the terms of the GPL-3 license.
-+
-+
-+IF (QCustomPlot_INCLUDE_DIR AND QCustomPlot_LIBRARIES)
-+  SET(QCustomPlot_FIND_QUIETLY TRUE)
-+ENDIF (QCustomPlot_INCLUDE_DIR AND QCustomPlot_LIBRARIES)
-+
-+FIND_PATH(QCustomPlot_INCLUDE_DIR NAMES qcustomplot.h )
-+FIND_LIBRARY(QCustomPlot_LIBRARIES NAMES qcustomplot )
-+
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QCustomPlot DEFAULT_MSG QCustomPlot_INCLUDE_DIR QCustomPlot_LIBRARIES)
++INSTALL(FILES cmake/QCustomPlotConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QCustomPlot)
 Index: qcustomplot/examples/interactions/CMakeLists.txt
 ===================================================================
 --- /dev/null
@@ -160,3 +136,27 @@ Index: qcustomplot/examples/text-document-integration/CMakeLists.txt
 +
 +TARGET_LINK_LIBRARIES(text ${Qt5Widgets_LIBRARIES} ${QCustomPlot_LIBRARIES} Qt5::PrintSupport)
 +INSTALL(TARGETS text DESTINATION ${CMAKE_INSTALL_BINDIR})
+Index: qcustomplot/cmake/QCustomPlotConfig.cmake
+===================================================================
+--- /dev/null
++++ qcustomplot/cmake/QCustomPlotConfig.cmake
+@@ -0,0 +1,19 @@
++# Try to find the QCustomPlot librairies
++#  QCustomPlot_FOUND - system has QCustomPlot lib
++#  QCustomPlot_INCLUDE_DIR - the GMP include directory
++#  QCustomPlot_LIBRARIES - Libraries needed to use QCustomPlot
++
++# Copyright (c) 2013, Anton Gladky <gladk at debian.org>
++#
++# Redistribution and use is allowed according to the terms of the GPL-3 license.
++
++
++IF (QCustomPlot_INCLUDE_DIR AND QCustomPlot_LIBRARIES)
++  SET(QCustomPlot_FIND_QUIETLY TRUE)
++ENDIF (QCustomPlot_INCLUDE_DIR AND QCustomPlot_LIBRARIES)
++
++FIND_PATH(QCustomPlot_INCLUDE_DIR NAMES qcustomplot.h )
++FIND_LIBRARY(QCustomPlot_LIBRARIES NAMES qcustomplot )
++
++include(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(QCustomPlot DEFAULT_MSG QCustomPlot_INCLUDE_DIR QCustomPlot_LIBRARIES)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qcustomplot.git