Hello community, here is the log from the commit of package libQtGTL for openSUSE:Factory checked in at 2013-07-30 16:06:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libQtGTL (Old) and /work/SRC/openSUSE:Factory/.libQtGTL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libQtGTL" Changes: -------- --- /work/SRC/openSUSE:Factory/libQtGTL/libQtGTL.changes 2012-02-08 15:38:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libQtGTL.new/libQtGTL.changes 2013-07-30 16:06:20.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Jul 28 16:50:39 UTC 2013 - [email protected] + +- Update to 0.9.3: + * Build fixes. +- Added a patch (libQtGTL-0.9.3-pkgconfig_deps.patch) to fix pkgconfig files + dependencies (taken from Fedora). +- Added a patch (libQtGTL-0.9.3-version.patch) to fix package version (taken + from Fedora). + +------------------------------------------------------------------- Old: ---- libQtGTL-0.9.2.tar.bz2 New: ---- libQtGTL-0.9.3-pkgconfig_deps.patch libQtGTL-0.9.3-version.patch libQtGTL-0.9.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libQtGTL.spec ++++++ --- /var/tmp/diff_new_pack.nNMlg1/_old 2013-07-30 16:06:21.000000000 +0200 +++ /var/tmp/diff_new_pack.nNMlg1/_new 2013-07-30 16:06:21.000000000 +0200 @@ -1,9 +1,9 @@ # # spec file for package libQtGTL # +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright 2009 Buschmann <[email protected]> -# Copyright (c) 2012 Asterios Dramis <[email protected]>. -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 Asterios Dramis <[email protected]>. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,25 +13,29 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define libver 0_1 -%define soversion 0.1 + +%define libver 0_2 +%define soversion 0.2 Name: libQtGTL -Version: 0.9.2 +Version: 0.9.3 Release: 0 -License: LGPL-2.0+ Summary: Qt4 Wrapper Classes and Widgets for OpenGTL -Url: http://www.opengtl.org/ +License: LGPL-2.0+ Group: System/Libraries +Url: http://www.opengtl.org/ Source0: http://download.opengtl.org/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM libQtGTL-0.9.3-pkgconfig_deps.patch [email protected] -- Fix pkgconfig files dependencies +Patch0: libQtGTL-0.9.3-pkgconfig_deps.patch +# PATCH-FIX-UPSTREAM libQtGTL-0.9.3-version.patch [email protected] -- Fix package version +Patch1: libQtGTL-0.9.3-version.patch +BuildRequires: OpenGTL-devel BuildRequires: cmake BuildRequires: libqt4-devel -BuildRequires: OpenGTL-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -65,6 +69,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build mkdir build @@ -80,9 +86,7 @@ cd .. %install -cd build -%make_install -cd .. +%make_install -C build %post -n libQtGTL%{libver} -p /sbin/ldconfig ++++++ libQtGTL-0.9.3-pkgconfig_deps.patch ++++++ diff -up libQtGTL-0.9.3/examples/QtCTL/CMakeLists.txt.dso_linking libQtGTL-0.9.3/examples/QtCTL/CMakeLists.txt diff -up libQtGTL-0.9.3/examples/QtShiva/CMakeLists.txt.dso_linking libQtGTL-0.9.3/examples/QtShiva/CMakeLists.txt diff -up libQtGTL-0.9.3/QtGTL/CMakeLists.txt.dso_linking libQtGTL-0.9.3/QtGTL/CMakeLists.txt diff -up libQtGTL-0.9.3/QtGTL/QtGTL.pc.cmake.dso_linking libQtGTL-0.9.3/QtGTL/QtGTL.pc.cmake --- libQtGTL-0.9.3/QtGTL/QtGTL.pc.cmake.dso_linking 2013-05-15 02:58:14.000000000 -0500 +++ libQtGTL-0.9.3/QtGTL/QtGTL.pc.cmake 2013-05-30 08:22:12.339958804 -0500 @@ -6,6 +6,6 @@ includedir=@INCLUDE_INSTALL_DIR@ Name: QtGTL Description: Qt Wrappers for Graphics Transformation Language Version: @QTGTL_VERSION@ -Requires: -Libs: -L${libdir} -lGTLCore -lQtGTL +Requires: GTLCore +Libs: -L${libdir} -lQtGTL Cflags: -I${includedir} diff -up libQtGTL-0.9.3/QtShiva/QtShiva.pc.cmake.dso_linking libQtGTL-0.9.3/QtShiva/QtShiva.pc.cmake --- libQtGTL-0.9.3/QtShiva/QtShiva.pc.cmake.dso_linking 2013-05-15 02:58:14.000000000 -0500 +++ libQtGTL-0.9.3/QtShiva/QtShiva.pc.cmake 2013-05-30 08:22:12.340958794 -0500 @@ -6,6 +6,6 @@ includedir=@INCLUDE_INSTALL_DIR@ Name: QtShiva Description: Qt Wrapers for the Shiva Kernel Transformation Language Version: @QTSHIVA_VERSION@ -Requires: -Libs: -L${libdir} -lOpenShiva -lQtShiva +Requires: OpenShiva +Libs: -L${libdir} -lQtShiva Cflags: -I${includedir} ++++++ libQtGTL-0.9.3-version.patch ++++++ diff -up libQtGTL-0.9.3/CMakeLists.txt.version libQtGTL-0.9.3/CMakeLists.txt --- libQtGTL-0.9.3/CMakeLists.txt.version 2013-05-15 02:58:14.000000000 -0500 +++ libQtGTL-0.9.3/CMakeLists.txt 2013-05-30 08:27:27.834660788 -0500 @@ -7,7 +7,7 @@ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREF set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/) set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin/) -set(QTGTL_VERSION 0.9.2) +set(QTGTL_VERSION 0.9.3) set(QTGTL_LIB_VERSION ${QTGTL_VERSION}) set(QTGTL_LIB_SOVERSION "0.2") ++++++ libQtGTL-0.9.2.tar.bz2 -> libQtGTL-0.9.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/.hg_archival.txt new/libQtGTL-0.9.3/.hg_archival.txt --- old/libQtGTL-0.9.2/.hg_archival.txt 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/.hg_archival.txt 2013-05-15 09:58:14.000000000 +0200 @@ -1,4 +1,4 @@ repo: f68880af1a9cd7fbd96920e7c8c612133a8fbc52 -node: 19ec517d8f25089b3cd4b7670c8f358287a8129b +node: b70195f041a29f7dd7993f6b1a497cb06b9eddf6 branch: default -tag: 0.9.2 +tag: 0.9.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/.hgtags new/libQtGTL-0.9.3/.hgtags --- old/libQtGTL-0.9.2/.hgtags 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/.hgtags 2013-05-15 09:58:14.000000000 +0200 @@ -1,2 +1,5 @@ 9ee168032e1434fef7d5202b7cce1213fe487c67 0.9.0 67ba9faa31dd566b6b30313497316737b7c0d3f3 0.9.1 +19ec517d8f25089b3cd4b7670c8f358287a8129b 0.9.2 +19ec517d8f25089b3cd4b7670c8f358287a8129b 0.9.2 +eace568176ac07a2e7631c98489de86421dfddb9 0.9.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/CMakeLists.txt new/libQtGTL-0.9.3/CMakeLists.txt --- old/libQtGTL-0.9.2/CMakeLists.txt 2012-02-06 20:57:23.000000000 +0100 +++ new/libQtGTL-0.9.3/CMakeLists.txt 2013-05-15 09:58:14.000000000 +0200 @@ -9,7 +9,7 @@ set(QTGTL_VERSION 0.9.2) set(QTGTL_LIB_VERSION ${QTGTL_VERSION}) -set(QTGTL_LIB_SOVERSION "0.1") +set(QTGTL_LIB_SOVERSION "0.2") set(QTSHIVA_VERSION ${QTGTL_VERSION}) set(QTSHIVA_LIB_VERSION ${QTGTL_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/QtGTL/CMakeLists.txt new/libQtGTL-0.9.3/QtGTL/CMakeLists.txt --- old/libQtGTL-0.9.2/QtGTL/CMakeLists.txt 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/QtGTL/CMakeLists.txt 2013-05-15 09:58:14.000000000 +0200 @@ -1,7 +1,7 @@ find_package(GTLCore REQUIRED) -include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${GTLCORE_INCLUDE_DIR}) +include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${GTLCORE_INCLUDE_DIRS}) ############################### libQtShiva ############################### @@ -13,7 +13,7 @@ qt4_automoc(${libQtShiva_SRCS}) add_library(QtGTL SHARED ${libQtGTL_SRCS}) -target_link_libraries(QtGTL ${GTLCORE_LIBRARIES} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${OPENSHIVA_LIBRARIES} ) +target_link_libraries(QtGTL ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${GTLCORE_LDFLAGS} ) install(TARGETS QtGTL DESTINATION ${LIB_INSTALL_DIR} ) install( FILES QImageBuffer.h QImageImage.h DESTINATION ${INCLUDE_INSTALL_DIR}/QtGTL ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/QtRijn/CMakeLists.txt new/libQtGTL-0.9.3/QtRijn/CMakeLists.txt --- old/libQtGTL-0.9.2/QtRijn/CMakeLists.txt 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/QtRijn/CMakeLists.txt 2013-05-15 09:58:14.000000000 +0200 @@ -1,5 +1,5 @@ -include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${OPENRIJN_INCLUDE_DIR}) +include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${OPENRIJN_INCLUDE_DIRS}) ############################### libQtRijn ############################### @@ -14,7 +14,7 @@ qt4_automoc(${libQtRijn_SRCS}) add_library( QtRijn SHARED ${libQtRijn_SRCS}) -target_link_libraries( QtRijn ${QT_QTGUI_LIBRARY} ${OPENRIJN_LIBRARIES} ) +target_link_libraries( QtRijn ${QT_QTGUI_LIBRARY} ${OPENRIJN_LDFLAGS} ) install(TARGETS QtRijn DESTINATION ${LIB_INSTALL_DIR} ) install( FILES Canvas.h Palette.h DESTINATION ${INCLUDE_INSTALL_DIR}/QtRijn ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/QtShiva/CMakeLists.txt new/libQtGTL-0.9.3/QtShiva/CMakeLists.txt --- old/libQtGTL-0.9.2/QtShiva/CMakeLists.txt 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/QtShiva/CMakeLists.txt 2013-05-15 09:58:14.000000000 +0200 @@ -1,7 +1,7 @@ find_package(OpenShiva REQUIRED) -include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${OPENSHIVA_INCLUDE_DIR}) +include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${OPENSHIVA_INCLUDE_DIRS}) ############################### libQtShiva ############################### @@ -25,7 +25,7 @@ qt4_automoc(${libQtShiva_SRCS}) add_library( QtShiva SHARED ${libQtShiva_SRCS}) -target_link_libraries( QtShiva ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${OPENSHIVA_LIBRARIES} ) +target_link_libraries( QtShiva ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${OPENSHIVA_LDFLAGS} ) install(TARGETS QtShiva DESTINATION ${LIB_INSTALL_DIR} ) install( FILES ParametersWidgetBase.h KernelParametersWidget.h SourceParametersWidget.h DESTINATION ${INCLUDE_INSTALL_DIR}/QtShiva ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/cmake/modules/FindGTLCore.cmake new/libQtGTL-0.9.3/cmake/modules/FindGTLCore.cmake --- old/libQtGTL-0.9.2/cmake/modules/FindGTLCore.cmake 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/cmake/modules/FindGTLCore.cmake 2013-05-15 09:58:14.000000000 +0200 @@ -1,36 +1,19 @@ - -INCLUDE(UsePkgConfig) -PKGCONFIG(GTLCore _GTLCoreIncDir _GTLCoreLinkDir _GTLCoreLinkFlags _GTLCoreCflags) +INCLUDE(FindPkgConfig) -set(GTLCORE_DEFINITIONS ${_GTLCoreCflags}) -set(GTLCORE_LIBRARIES ${_GTLCoreLinkFlags}) -set(GTLCORE_INCLUDE_DIR ${_GTLCoreIncDir}) - -if(GTLCORE_DEFINITIONS AND GTLCORE_LIBRARIES) - - FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/bin/ /usr/local/bin ) - - # query pkg-config asking for GTLCore == 0.9.2 - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.9.3 GTLCore RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) - - if(_return_VALUE STREQUAL "0") - set(GTLCORE_FOUND TRUE) - set(HAVE_GTLCORE TRUE) - else(_return_VALUE STREQUAL "0") - message(STATUS "GTLCore >= 0.9.3 was found") - endif(_return_VALUE STREQUAL "0") -endif(GTLCORE_DEFINITIONS AND GTLCORE_LIBRARIES) +pkg_check_modules(GTLCORE GTLCore>=0.9.16) if (GTLCORE_FOUND) - if (NOT GTLCore_FIND_QUIETLY) - message(STATUS "Found GTLCORE: ${GTLCORE_LIBRARIES}") - endif (NOT GTLCore_FIND_QUIETLY) -else (GTLCORE_FOUND) - if (NOT GTLCore_FIND_QUIETLY) + set(HAVE_GTLCORE TRUE) + message(STATUS "GTLCore >= 0.9.16 was found") + if (NOT GTLCORE_FIND_QUIETLY) + message(STATUS "Found GTLCore: ${GTLCORE_LIBRARIES}") + endif () +else () + if (NOT GTLCORE_FIND_QUIETLY) message(STATUS "GTLCore was NOT found.") - endif (NOT GTLCore_FIND_QUIETLY) - if (GTLCore_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find GTLCORE") - endif (GTLCore_FIND_REQUIRED) -endif (GTLCORE_FOUND) + endif () + if (GTLCORE_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find GTLCore") + endif () +endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/cmake/modules/FindOpenCTL.cmake new/libQtGTL-0.9.3/cmake/modules/FindOpenCTL.cmake --- old/libQtGTL-0.9.2/cmake/modules/FindOpenCTL.cmake 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/cmake/modules/FindOpenCTL.cmake 2013-05-15 09:58:14.000000000 +0200 @@ -1,36 +1,20 @@ +INCLUDE(FindPkgConfig) -INCLUDE(UsePkgConfig) -PKGCONFIG(OpenCTL _OpenCTLIncDir _OpenCTLLinkDir _OpenCTLLinkFlags _OpenCTLCflags) +pkg_check_modules(OPENCTL OpenCTL>=0.9.16) -set(OPENCTL_DEFINITIONS ${_OpenCTLCflags}) -set(OPENCTL_LIBRARIES ${_OpenCTLLinkFlags}) -set(OPENCTL_INCLUDE_DIR ${_OpenCTLIncDir}) - -if(OPENCTL_DEFINITIONS AND OPENCTL_LIBRARIES) - - FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/bin/ /usr/local/bin ) - - # query pkg-config asking for OpenCTL == 0.9.2 - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.9.3 OpenCTL RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) - - if(_return_VALUE STREQUAL "0") - set(OPENCTL_FOUND TRUE) +if (OPENCTL_FOUND) set(HAVE_OPENCTL TRUE) - else(_return_VALUE STREQUAL "0") - message(STATUS "OpenCTL >= 0.9.3 was found") - endif(_return_VALUE STREQUAL "0") -endif(OPENCTL_DEFINITIONS AND OPENCTL_LIBRARIES) + message(STATUS "OpenCTL Found Version: " ${OPENCTL_VERSION}) -if (OPENCTL_FOUND) - if (NOT OpenCTL_FIND_QUIETLY) + if (NOT OpenCTL_FIND_QUIETLY ) message(STATUS "Found OPENCTL: ${OPENCTL_LIBRARIES}") endif (NOT OpenCTL_FIND_QUIETLY) -else (OPENCTL_FOUND) +else () if (NOT OpenCTL_FIND_QUIETLY) message(STATUS "OpenCTL was NOT found.") - endif (NOT OpenCTL_FIND_QUIETLY) + endif () if (OpenCTL_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find OPENCTL") - endif (OpenCTL_FIND_REQUIRED) -endif (OPENCTL_FOUND) + endif () +endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/cmake/modules/FindOpenRijn.cmake new/libQtGTL-0.9.3/cmake/modules/FindOpenRijn.cmake --- old/libQtGTL-0.9.2/cmake/modules/FindOpenRijn.cmake 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/cmake/modules/FindOpenRijn.cmake 2013-05-15 09:58:14.000000000 +0200 @@ -1,35 +1,19 @@ -INCLUDE(UsePkgConfig) -PKGCONFIG(OpenRijn _OpenRijnIncDir _OpenRijnLinkDir _OpenRijnLinkFlags _OpenRijnCflags) +INCLUDE(FindPkgConfig) -set(OPENRIJN_DEFINITIONS ${_OpenRijnCflags}) -set(OPENRIJN_LIBRARIES ${_OpenRijnLinkFlags}) -set(OPENRIJN_INCLUDE_DIR ${_OpenRijnIncDir}) - -if(OPENRIJN_DEFINITIONS AND OPENRIJN_LIBRARIES) - - FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/bin/ /usr/local/bin ) - - # query pkg-config asking for OpenRijn >= 0.9.7 - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.9.7 OpenRijn RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) - - if(_return_VALUE STREQUAL "0") - set(OPENRIJN_FOUND TRUE) - set(HAVE_OPENRIJN TRUE) - else(_return_VALUE STREQUAL "0") - message(STATUS "OpenRijn >= 0.9.3 was found") - endif(_return_VALUE STREQUAL "0") -endif(OPENRIJN_DEFINITIONS AND OPENRIJN_LIBRARIES) +pkg_check_modules(OPENRIJN OpenRijn>=0.9.16) if (OPENRIJN_FOUND) + set(HAVE_OPENRIJN TRUE) + message(STATUS "OpenRijn >= 0.9.16 was found") if (NOT OPENRIJN_FIND_QUIETLY) message(STATUS "Found OpenRijn: ${OPENRIJN_LIBRARIES}") - endif (NOT OPENRIJN_FIND_QUIETLY) -else (OPENRijn_FOUND) + endif () +else () if (NOT OPENRIJN_FIND_QUIETLY) message(STATUS "OpenRijn was NOT found.") - endif (NOT OPENRIJN_FIND_QUIETLY) + endif () if (OPENRIJN_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find OpenRijn") - endif (OPENRIJN_FIND_REQUIRED) -endif (OPENRIJN_FOUND) + endif () +endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/cmake/modules/FindOpenShiva.cmake new/libQtGTL-0.9.3/cmake/modules/FindOpenShiva.cmake --- old/libQtGTL-0.9.2/cmake/modules/FindOpenShiva.cmake 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/cmake/modules/FindOpenShiva.cmake 2013-05-15 09:58:14.000000000 +0200 @@ -1,35 +1,19 @@ -INCLUDE(UsePkgConfig) -PKGCONFIG(OpenShiva _OpenShivaIncDir _OpenShivaLinkDir _OpenShivaLinkFlags _OpenShivaCflags) +INCLUDE(FindPkgConfig) -set(OPENSHIVA_DEFINITIONS ${_OpenShivaCflags}) -set(OPENSHIVA_LIBRARIES ${_OpenShivaLinkFlags}) -set(OPENSHIVA_INCLUDE_DIR ${_OpenShivaIncDir}) - -if(OPENSHIVA_DEFINITIONS AND OPENSHIVA_LIBRARIES) - - FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/bin/ /usr/local/bin ) - - # query pkg-config asking for OpenShiva >= 0.9.7 - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.9.7 OpenShiva RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) - - if(_return_VALUE STREQUAL "0") - set(OPENSHIVA_FOUND TRUE) - set(HAVE_OPENSHIVA TRUE) - else(_return_VALUE STREQUAL "0") - message(STATUS "OpenShiva >= 0.9.3 was found") - endif(_return_VALUE STREQUAL "0") -endif(OPENSHIVA_DEFINITIONS AND OPENSHIVA_LIBRARIES) +pkg_check_modules(OPENSHIVA OpenShiva>=0.9.16) if (OPENSHIVA_FOUND) + set(HAVE_OPENSHIVA TRUE) + message(STATUS "OpenShiva >= 0.9.16 was found") if (NOT OPENSHIVA_FIND_QUIETLY) message(STATUS "Found OpenShiva: ${OPENSHIVA_LIBRARIES}") - endif (NOT OPENSHIVA_FIND_QUIETLY) -else (OPENShiva_FOUND) + endif () +else () if (NOT OPENSHIVA_FIND_QUIETLY) message(STATUS "OpenShiva was NOT found.") - endif (NOT OPENSHIVA_FIND_QUIETLY) + endif () if (OPENSHIVA_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find OPENShiva") - endif (OPENSHIVA_FIND_REQUIRED) -endif (OPENSHIVA_FOUND) + message(FATAL_ERROR "Could NOT find OpenShiva") + endif () +endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/examples/QtCTL/CMakeLists.txt new/libQtGTL-0.9.3/examples/QtCTL/CMakeLists.txt --- old/libQtGTL-0.9.2/examples/QtCTL/CMakeLists.txt 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/examples/QtCTL/CMakeLists.txt 2013-05-15 09:58:14.000000000 +0200 @@ -3,12 +3,7 @@ set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) -message(STATUS ${OPENCTL_INCLUDE_DIR}) - -include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${OPENCTL_INCLUDE_DIR}) - - -message(STATUS ${OPENCTL_INCLUDE_DIR}) +include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${OPENCTL_INCLUDE_DIRS}) ## QtCTL @@ -21,5 +16,5 @@ add_executable(qCTL ${Qt_CTL_SRCS}) # set_target_properties( QtCTL PROPERTIES COMPILE_FLAGS ${OPENCTL_COMPILE_FLAGS}) -target_link_libraries(qCTL ${QT_LIBRARY_DIR} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${OPENCTL_LIBRARIES} QtGTL) +target_link_libraries(qCTL ${QT_LIBRARY_DIR} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${OPENCTL_LDFLAGS} QtGTL) # install(TARGETS QtCTL DESTINATION ${BIN_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libQtGTL-0.9.2/examples/QtShiva/CMakeLists.txt new/libQtGTL-0.9.3/examples/QtShiva/CMakeLists.txt --- old/libQtGTL-0.9.2/examples/QtShiva/CMakeLists.txt 2012-01-12 20:56:38.000000000 +0100 +++ new/libQtGTL-0.9.3/examples/QtShiva/CMakeLists.txt 2013-05-15 09:58:14.000000000 +0200 @@ -5,7 +5,7 @@ message(STATUS ${OPENSHIVA_INCLUDE_DIR}) -include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${OPENSHIVA_INCLUDE_DIR}) +include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${OPENSHIVA_INCLUDE_DIRS}) message(STATUS ${OPENSHIVA_INCLUDE_DIR}) @@ -20,5 +20,5 @@ qt4_automoc(${Qt_SHIVA_SRCS}) add_executable(qShiva ${Qt_SHIVA_SRCS} ) -target_link_libraries(qShiva ${QT_LIBRARY_DIR} ${QT_QTGUI_LIBRARY} ${OPENSHIVA_LIBRARIES} ${QT_QTCORE_LIBRARY} QtGTL QtShiva) +target_link_libraries(qShiva ${QT_LIBRARY_DIR} ${QT_QTGUI_LIBRARY} ${OPENSHIVA_LDFLAGS} ${QT_QTCORE_LIBRARY} QtGTL QtShiva) # install(TARGETS QtShiva DESTINATION ${BIN_INSTALL_DIR} ) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
