Sophie

Sophie

distrib > Mageia > 8 > armv7hl > media > core-release-src > by-pkgid > cac349fde37a2ca2138e11e52acf8320 > files > 3

qimageblitz5-0.0.6-10.svn1515099.6.mga8.src.rpm

Index: a/CMakeLists.txt
===================================================================
--- a/CMakeLists.txt	(revision 1454199)
+++ b/CMakeLists.txt	(working copy)
@@ -9,6 +9,7 @@
   find_package(Qt5Core QUIET)
 endif()
 if (Qt5Core_FOUND)
+  set(QT_PREFIX "5")
   message(STATUS "Building with Qt5 support")
   cmake_minimum_required(VERSION 2.8.8) # Bump requirement for automoc and convenience macros.
   set(CMAKE_AUTOMOC ON)
@@ -16,6 +17,7 @@
   find_package(Qt5Gui REQUIRED)
   find_package(Qt5Widgets REQUIRED)
 else()
+  set(QT_PREFIX "")
   find_package(Qt4 REQUIRED)
   # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
   include(${QT_USE_FILE})
Index: a/blitz/CMakeLists.txt
===================================================================
--- a/blitz/CMakeLists.txt	(revision 1454199)
+++ b/blitz/CMakeLists.txt	(working copy)
@@ -72,13 +72,14 @@
     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
 )
 
+#set(INCLUDE_INSTALL_DIR include/qimageblitz${QT_PREFIX})
 install( FILES qimageblitz.h qimageblitz_export.h blitzcpu.h DESTINATION include/qimageblitz COMPONENT Devel )
 
 if(NOT WIN32)
-  configure_file("qimageblitz.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc"
+  configure_file("qimageblitz.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz${QT_PREFIX}.pc"
   @ONLY)
 
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc DESTINATION
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz${QT_PREFIX}.pc DESTINATION
   ${LIB_INSTALL_DIR}/pkgconfig)
 endif(NOT WIN32)
 
Index: a/test/CMakeLists.txt
===================================================================
--- a/test/CMakeLists.txt	(revision 1454199)
+++ b/test/CMakeLists.txt	(working copy)
@@ -23,14 +23,14 @@
   cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
-add_executable(blitztest ${blitztest_SRCS})
+add_executable(blitztest${QT_PREFIX} ${blitztest_SRCS})
 
 if (Qt5Core_FOUND)
-  target_link_libraries(blitztest Qt5::Core Qt5::Gui Qt5::Widgets)
+  target_link_libraries(blitztest${QT_PREFIX} Qt5::Core Qt5::Gui Qt5::Widgets)
 endif()
 
-target_link_libraries(blitztest ${QT_QTCORE_LIBRARY}
+target_link_libraries(blitztest${QT_PREFIX} ${QT_QTCORE_LIBRARY}
 ${QT_QTGUI_LIBRARY} qimageblitz)
 
-install(TARGETS blitztest DESTINATION ${BIN_INSTALL_DIR})
+install(TARGETS blitztest${QT_PREFIX} DESTINATION ${BIN_INSTALL_DIR})
 
Index: a/blitz/qimageblitz.pc.cmake
===================================================================
--- a/blitz/qimageblitz.pc.cmake	(revision 1454199)
+++ b/blitz/qimageblitz.pc.cmake	(working copy)
@@ -6,6 +6,6 @@
 Name: Blitz
 Description: Blitz image effect and filter library
 Version: @BLITZ_LIB_VERSION_STRING@
-Requires: QtGui
+Requires: Qt5Gui
 Libs: -L${libdir} -lqimageblitz
 Cflags: -I${includedir}