[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 868b8831ab61df3c1aa7963142e98952e18e97b9

[malat <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".

The branch, release has been updated
       via  868b8831ab61df3c1aa7963142e98952e18e97b9 (commit)
      from  a537cd8d3bcc88e37c0bd51c2383bc6ac6b1b773 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/868b8831ab61df3c1aa7963142e98952e18e97b9/

commit 868b8831ab61df3c1aa7963142e98952e18e97b9
Author: Marat Nagayev <nag...@gm...>
Date:   Sun Oct 1 15:30:36 2023 +0300

    Use Qt5/Qt6 in examples

diff --git a/Examples/Cxx/CMakeLists.txt b/Examples/Cxx/CMakeLists.txt
index ff40f5bfe..d1977229e 100644
--- a/Examples/Cxx/CMakeLists.txt
+++ b/Examples/Cxx/CMakeLists.txt
@@ -25,7 +25,8 @@ find_package(SQLITE3)
 
 find_package(MAGIC)
 
-find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui)
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets)
 # cmake 2.6.4 does not set it to advanced
 mark_as_advanced(QT_QMAKE_EXECUTABLE)
 
@@ -107,17 +108,14 @@ set(EXAMPLES_SRCS
   )
 endif()
 
-if(QT4_FOUND)
-  include(${QT_USE_FILE})
+if(QT5_FOUND OR QT6_FOUND)
   add_executable(ConvertToQImage ConvertToQImage.cxx)
-  # qtGUI will resolved QImage symbol
-  # qtcore will resolve qstring symbols
-  target_link_libraries(ConvertToQImage gdcmMSFF ${QT_LIBRARIES})
+  target_link_libraries(ConvertToQImage gdcmMSFF Qt${QT_VERSION_MAJOR}::Widgets)
 
   add_executable(ReadUTF8QtDir ReadUTF8QtDir.cxx)
-  target_link_libraries(ReadUTF8QtDir gdcmMSFF ${QT_LIBRARIES})
+  target_link_libraries(ReadUTF8QtDir gdcmMSFF Qt${QT_VERSION_MAJOR}::Widgets)
   add_executable(CStoreQtProgress CStoreQtProgress.cxx)
-  target_link_libraries(CStoreQtProgress gdcmMEXD gdcmMSFF ${QT_LIBRARIES})
+  target_link_libraries(CStoreQtProgress gdcmMEXD gdcmMSFF Qt${QT_VERSION_MAJOR}::Widgets)
 endif()
 
 if(MAGIC_FOUND)

-----------------------------------------------------------------------

Summary of changes:
 Examples/Cxx/CMakeLists.txt | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM