This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository libbpp-qt.
commit 2b275208226e37a8a128f86a447bb0bedc222ae1 Author: Andreas Tille <[email protected]> Date: Wed Feb 7 08:22:42 2018 +0100 New upstream version 2.3.2 --- CMakeLists.txt | 10 ++++++---- ChangeLog | 3 +++ package.cmake.in | 4 ++-- src/Bpp/Qt/Tree/TreeCanvasControlers.cpp | 2 ++ src/CMakeLists.txt | 6 ++---- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0be31e..6cb0834 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,10 +55,12 @@ include (GNUInstallDirs) find_package (bpp-phyl 11.0.0 REQUIRED) # Find the Qt installation -set (QT_USE_IMPORTED_TARGETS TRUE) -find_package (Qt4 COMPONENTS QtCore QtGui REQUIRED) -include (${QT_USE_FILE}) -set (qt-libs ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) +#set (QT_USE_IMPORTED_TARGETS TRUE) +set(CMAKE_AUTOMOC ON) +find_package (Qt5Widgets) +find_package (Qt5Core) +find_package (Qt5Gui) +set (qt-libs Qt5::Core Qt5::Gui Qt5::Widgets) # CMake package set (cmake-package-location ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) diff --git a/ChangeLog b/ChangeLog index f8939a7..4949278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +13/09/17 Julien Dutheil +* Ported to Qt5. + 06/06/17 -*- Version 2.3.1 -*- 10/05/17 -*- Version 2.3.0 -*- diff --git a/package.cmake.in b/package.cmake.in index 497a69a..dd97241 100644 --- a/package.cmake.in +++ b/package.cmake.in @@ -9,8 +9,8 @@ if (NOT @PROJECT_NAME@_FOUND) find_package (bpp-phyl @bpp-phyl_VERSION@ REQUIRED) # QT dep (pull imported target required by bpp-qt) set (QT_USE_IMPORTED_TARGETS TRUE) - find_package (Qt4 COMPONENTS QtCore QtGui REQUIRED) - include (${QT_USE_FILE}) + find_package (Qt5 COMPONENTS Core Gui Widgets REQUIRED) + #include (${QT_USE_FILE}) # Add targets include ("${CMAKE_CURRENT_LIST_DIR}/@[email protected]") # Append targets to convenient lists diff --git a/src/Bpp/Qt/Tree/TreeCanvasControlers.cpp b/src/Bpp/Qt/Tree/TreeCanvasControlers.cpp index a75e00e..84f26e9 100644 --- a/src/Bpp/Qt/Tree/TreeCanvasControlers.cpp +++ b/src/Bpp/Qt/Tree/TreeCanvasControlers.cpp @@ -42,6 +42,8 @@ knowledge of the CeCILL license and that you accept its terms. //From Qt: #include <QtGui> #include <QRadioButton> +#include <QHBoxLayout> +#include <QButtonGroup> using namespace bpp; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 65f32d7..0ffcf4e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,10 +17,8 @@ set (H_MOC_FILES Bpp/Qt/Tree/TreeCanvasControlers.h Bpp/Qt/Tree/TreeStatisticsBox.h ) -qt4_wrap_cpp (CPP_MOC_FILES ${H_MOC_FILES}) - # Build the static lib -add_library (${PROJECT_NAME}-static STATIC ${CPP_FILES} ${CPP_MOC_FILES}) +add_library (${PROJECT_NAME}-static STATIC ${CPP_FILES}) target_include_directories (${PROJECT_NAME}-static PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}> @@ -29,7 +27,7 @@ set_target_properties (${PROJECT_NAME}-static PROPERTIES OUTPUT_NAME ${PROJECT_N target_link_libraries (${PROJECT_NAME}-static ${BPP_LIBS_STATIC} ${qt-libs}) # Build the shared lib -add_library (${PROJECT_NAME}-shared SHARED ${CPP_FILES} ${CPP_MOC_FILES}) +add_library (${PROJECT_NAME}-shared SHARED ${CPP_FILES}) target_include_directories (${PROJECT_NAME}-shared PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-qt.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
