[qcustomplot] 02/05: Refresh cmake-patch. Use qt5 for building the library.
Anton Gladky
gladk at moszumanska.debian.org
Thu Apr 3 20:49:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository qcustomplot.
commit d6daa9bf739b1e32b00a700058a429774a5fb1dc
Author: Anton Gladky <gladk at debian.org>
Date: Thu Apr 3 22:33:11 2014 +0200
Refresh cmake-patch. Use qt5 for building the library.
---
debian/patches/01_Add_CMakeLists.patch | 133 +++++++++++++++------------------
1 file changed, 60 insertions(+), 73 deletions(-)
diff --git a/debian/patches/01_Add_CMakeLists.patch b/debian/patches/01_Add_CMakeLists.patch
index d8527d2..91ce635 100644
--- a/debian/patches/01_Add_CMakeLists.patch
+++ b/debian/patches/01_Add_CMakeLists.patch
@@ -1,36 +1,35 @@
Description: Add CMakeLists files for building of shared library and to examples
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-11-08
+Last-Update: 2014-04-03
--- /dev/null
+++ b/CMakeLists.txt
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,29 @@
+PROJECT(qcustomplot CXX)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+SET(Q_MAJOR_VERSION "1")
-+SET(Q_MINOR_VERSION "1")
++SET(Q_MINOR_VERSION "2")
+SET(Q_PATCH_VERSION "0")
+
-+
+INCLUDE(GNUInstallDirs)
-+INCLUDE(FindQt4)
-+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-+INCLUDE_DIRECTORIES(${QT_INCLUDES})
-+INCLUDE(${QT_USE_FILE})
++FIND_PACKAGE(Qt5Widgets REQUIRED)
++FIND_PACKAGE(Qt5PrintSupport REQUIRED)
++INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS} /usr/include/qt5/QtPrintSupport)
++ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS} -DQCUSTOMPLOT_COMPILE_LIBRARY)
++SET(CMAKE_AUTOMOC ON)
++
+
+set(Q_VERSION "${Q_MAJOR_VERSION}.${Q_MINOR_VERSION}.${Q_PATCH_VERSION}")
+set(Q_SOVERSION "${Q_MAJOR_VERSION}.${Q_MINOR_VERSION}")
+
-+
-+QT4_WRAP_CPP(Q_MOC_OUTFILES qcustomplot.h)
-+
-+ADD_LIBRARY(qcustomplot SHARED qcustomplot.cpp ${Q_MOC_OUTFILES})
++ADD_LIBRARY(qcustomplot SHARED qcustomplot.cpp)
++QT5_USE_MODULES(qcustomplot Widgets)
+
+SET_TARGET_PROPERTIES(qcustomplot PROPERTIES
+ VERSION ${Q_VERSION}
+ SOVERSION ${Q_SOVERSION})
-+TARGET_LINK_LIBRARIES(qcustomplot ${QT_LIBRARIES})
++TARGET_LINK_LIBRARIES(qcustomplot ${Qt5Widgets_LIBRARIES} Qt5::PrintSupport)
+
+INSTALL(TARGETS qcustomplot DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+INSTALL(FILES qcustomplot.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
@@ -59,105 +58,93 @@ Last-Update: 2013-11-08
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QCustomPlot DEFAULT_MSG QCustomPlot_INCLUDE_DIR QCustomPlot_LIBRARIES)
--- /dev/null
+++ b/examples/interactions/CMakeLists.txt
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,20 @@
+project(interactions CXX)
+cmake_minimum_required(VERSION 2.8)
+
++FIND_PACKAGE(QCustomPlot REQUIRED)
++FIND_PACKAGE(Qt5PrintSupport REQUIRED)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
+
+INCLUDE(GNUInstallDirs)
++FIND_PACKAGE(Qt5Widgets REQUIRED)
++INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${QCustomPlot_INCLUDE_DIR})
++ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS} -DQCUSTOMPLOT_USE_LIBRARY)
++SET(CMAKE_AUTOMOC ON)
+
++QT5_WRAP_UI(UI_HEADERS mainwindow.ui)
++ADD_EXECUTABLE(interactions main.cpp mainwindow.cpp ${UI_HEADERS})
++QT5_USE_MODULES(interactions Widgets)
+
-+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-+FIND_PACKAGE(QCustomPlot REQUIRED)
-+
-+INCLUDE_DIRECTORIES(${QT_INCLUDES})
-+INCLUDE_DIRECTORIES(${QCustomPlot_INCLUDE_DIR})
-+INCLUDE(${QT_USE_FILE})
-+
-+QT4_WRAP_CPP(TEST_MOC_OUTFILES mainwindow.h)
-+QT4_WRAP_UI(TEST_FORMS_HEADERS mainwindow.ui)
-+
-+ADD_EXECUTABLE(interactions main.cpp mainwindow.cpp ${TEST_MOC_OUTFILES} ${TEST_FORMS_HEADERS} ${TEST_MOC_OUTFILES})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-+
-+TARGET_LINK_LIBRARIES(interactions ${QT_LIBRARIES} ${QCustomPlot_LIBRARIES})
++TARGET_LINK_LIBRARIES(interactions ${Qt5Widgets_LIBRARIES} ${QCustomPlot_LIBRARIES} Qt5::PrintSupport)
+INSTALL(TARGETS interactions DESTINATION ${CMAKE_INSTALL_BINDIR})
--- /dev/null
+++ b/examples/plots/CMakeLists.txt
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,20 @@
+project(plots CXX)
+cmake_minimum_required(VERSION 2.8)
+
++FIND_PACKAGE(QCustomPlot REQUIRED)
++FIND_PACKAGE(Qt5PrintSupport REQUIRED)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
+
+INCLUDE(GNUInstallDirs)
++FIND_PACKAGE(Qt5Widgets REQUIRED)
++INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${QCustomPlot_INCLUDE_DIR})
++ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS} -DQCUSTOMPLOT_USE_LIBRARY)
++SET(CMAKE_AUTOMOC ON)
+
++QT5_WRAP_UI(UI_HEADERS mainwindow.ui)
++ADD_EXECUTABLE(plots main.cpp mainwindow.cpp ${UI_HEADERS})
++QT5_USE_MODULES(plots Widgets)
+
-+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-+FIND_PACKAGE(QCustomPlot REQUIRED)
-+
-+INCLUDE_DIRECTORIES(${QT_INCLUDES})
-+INCLUDE_DIRECTORIES(${QCustomPlot_INCLUDE_DIR})
-+INCLUDE(${QT_USE_FILE})
-+
-+QT4_WRAP_CPP(TEST_MOC_OUTFILES mainwindow.h)
-+QT4_WRAP_UI(TEST_FORMS_HEADERS mainwindow.ui)
-+
-+ADD_EXECUTABLE(plots main.cpp mainwindow.cpp ${TEST_MOC_OUTFILES} ${TEST_FORMS_HEADERS} ${TEST_MOC_OUTFILES})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-+
-+TARGET_LINK_LIBRARIES(plots ${QT_LIBRARIES} ${QCustomPlot_LIBRARIES})
++TARGET_LINK_LIBRARIES(plots ${Qt5Widgets_LIBRARIES} ${QCustomPlot_LIBRARIES} Qt5::PrintSupport)
+INSTALL(TARGETS plots DESTINATION ${CMAKE_INSTALL_BINDIR})
--- /dev/null
+++ b/examples/scrollbar-axis-range-control/CMakeLists.txt
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,20 @@
+project(scrollbar CXX)
+cmake_minimum_required(VERSION 2.8)
+
++FIND_PACKAGE(QCustomPlot REQUIRED)
++FIND_PACKAGE(Qt5PrintSupport REQUIRED)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
+
+INCLUDE(GNUInstallDirs)
++FIND_PACKAGE(Qt5Widgets REQUIRED)
++INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${QCustomPlot_INCLUDE_DIR})
++ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS} -DQCUSTOMPLOT_USE_LIBRARY)
++SET(CMAKE_AUTOMOC ON)
+
++QT5_WRAP_UI(UI_HEADERS mainwindow.ui)
++ADD_EXECUTABLE(scrollbar main.cpp mainwindow.cpp ${UI_HEADERS})
++QT5_USE_MODULES(scrollbar Widgets)
+
-+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-+FIND_PACKAGE(QCustomPlot REQUIRED)
-+
-+INCLUDE_DIRECTORIES(${QT_INCLUDES})
-+INCLUDE_DIRECTORIES(${QCustomPlot_INCLUDE_DIR})
-+INCLUDE(${QT_USE_FILE})
-+
-+QT4_WRAP_CPP(TEST_MOC_OUTFILES mainwindow.h)
-+QT4_WRAP_UI(TEST_FORMS_HEADERS mainwindow.ui)
-+
-+ADD_EXECUTABLE(scrollbar main.cpp mainwindow.cpp ${TEST_MOC_OUTFILES} ${TEST_FORMS_HEADERS} ${TEST_MOC_OUTFILES})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-+
-+TARGET_LINK_LIBRARIES(scrollbar ${QT_LIBRARIES} ${QCustomPlot_LIBRARIES})
++TARGET_LINK_LIBRARIES(scrollbar ${Qt5Widgets_LIBRARIES} ${QCustomPlot_LIBRARIES} Qt5::PrintSupport)
+INSTALL(TARGETS scrollbar DESTINATION ${CMAKE_INSTALL_BINDIR})
--- /dev/null
+++ b/examples/text-document-integration/CMakeLists.txt
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,20 @@
+project(text CXX)
+cmake_minimum_required(VERSION 2.8)
+
++FIND_PACKAGE(QCustomPlot REQUIRED)
++FIND_PACKAGE(Qt5PrintSupport REQUIRED)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
+
+INCLUDE(GNUInstallDirs)
++FIND_PACKAGE(Qt5Widgets REQUIRED)
++INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${QCustomPlot_INCLUDE_DIR})
++ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS} -DQCUSTOMPLOT_USE_LIBRARY)
++SET(CMAKE_AUTOMOC ON)
+
++QT5_WRAP_UI(UI_HEADERS mainwindow.ui)
++ADD_EXECUTABLE(text main.cpp mainwindow.cpp qcpdocumentobject.cpp ${UI_HEADERS})
++QT5_USE_MODULES(text Widgets)
+
-+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-+FIND_PACKAGE(QCustomPlot REQUIRED)
-+
-+INCLUDE_DIRECTORIES(${QT_INCLUDES})
-+INCLUDE_DIRECTORIES(${QCustomPlot_INCLUDE_DIR})
-+INCLUDE(${QT_USE_FILE})
-+
-+QT4_WRAP_CPP(TEST_MOC_OUTFILES mainwindow.h qcpdocumentobject.h)
-+QT4_WRAP_UI(TEST_FORMS_HEADERS mainwindow.ui)
-+
-+ADD_EXECUTABLE(text main.cpp mainwindow.cpp qcpdocumentobject.cpp ${TEST_MOC_OUTFILES} ${TEST_FORMS_HEADERS} ${TEST_MOC_OUTFILES})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-+
-+TARGET_LINK_LIBRARIES(text ${QT_LIBRARIES} ${QCustomPlot_LIBRARIES})
++TARGET_LINK_LIBRARIES(text ${Qt5Widgets_LIBRARIES} ${QCustomPlot_LIBRARIES} Qt5::PrintSupport)
+INSTALL(TARGETS text DESTINATION ${CMAKE_INSTALL_BINDIR})
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qcustomplot.git
More information about the debian-science-commits
mailing list