Skip to content

Commit

Permalink
ENH: Update CTK to latest version
Browse files Browse the repository at this point in the history
Contains minor fixes and improvements:

Revision: dec834fccffebdc3b0896c157d39e3c0031c4a0a
Author: Andras Lasso <lasso@queensu.ca>
Date: 2023-01-04 7:47:00 AM
Message:
BUG: Fix ctk::vtkImageDataToQImage function

Bytes per line must be specified to make sure the image is always converted correctly.

The problem was reported and solution was proposed here:
https://discourse.slicer.org/t/ctk-vtkimagedatatoqimage-generates-weird-results/25881/2

Revision: 1abb81ed5cf0d91827518c55f73047d8fcc870f2
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2022-12-13 11:34:53 PM
Message:
COMP: Update default Qt version from 4 to 5


Revision: 83275c7a06426f0e01e1e4368f8f69df3284aba1
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2022-11-02 3:27:52 AM
Message:
ENH: Update VTK to v8.0.1 to support Qt4, to v9.2.2 to support Qt5

* v8.0.1 is the last VTK version officially supporting Qt4

* Support passing CTK_VTK_VERSION_MAJOR to select the VTK version.
  Default is 9 if building against Qt5, and 8 if building against Qt4.

* Options for either Qt4 or Qt5 are passed to the currently selected
  VTK version based on the value of CTK_QT_VERSION

* Initialize VTK_PYTHON_VERSION with PYTHON_VERSION_MAJOR

* Remove setting of obsolete options VTK_USE_QT, VTK_USE_GUISUPPORT,
  DESIRED_QT_VERSION and VTK_USE_QVTK_QTOPENGL.

* Set OpenGL_GL_PREFERENCE. See 23d814488 (BUG: Fix linux
  package removing dependency to GLVND libraries)

Revision: 3f9f330aabe26c0b96948c73a0c0a83a678fac70
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2022-11-02 11:31:29 PM
Message:
COMP: Update QtTesting to support building against C++98

This commit fixes the warnings reported when setting CMAKE_CXX_STANDARD
to value corresponding to C++ version newer than C++98.

The differences between the two version are the following:

$ git shortlog c44b32fde..b5324a213 --no-merges
Ben Boeckel (2):
      clang-tidy: fix override issues
      cmake: add an option for building examples

Edern Haumont (1):
      Allow events to be played individually

Utkarsh Ayachit (5):
      Fixes issues when test playback fails to find an object.
      Add clang-format file (same as ParaView).
      Add gitattributes.
      clang-format: fix code formatting
      Add ability to add custom library prefix/suffix.

Revision: 196828fabc2cb1f00df405dabdd0147a2f700ef1
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2022-11-02 1:04:57 AM
Message:
BUG: Disable DCMTK ICU default for Superbuild

Adapted from 88b9fd9e4

Fixes an observed issue where building on Windows with Anaconda in PATH
could result in a path being found for nonexistent ICU libraries.

Co-authored-by: Tom Birdsong <tom.birdsong@kitware.com>

Revision: 120f5428a6fc6a8534501ded86fbddf921713d91
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2022-11-02 1:02:59 AM
Message:
COMP: Update DCMTK to fix CMP0115 CMake warnings

Adapted from 3eb2c42f4

List of DCMTK changes:

$ git shortlog f2f7b5ee0..0f9bf4d9e --no-merges
Marco Eichelberg (1):
      [Backport] Made file extensions explicit for CMake CMP0115.

This commit fixes warning like the following:

  CMake Warning (dev) at CMake/dcmtkMacros.cmake:82 (add_library):
    Policy CMP0115 is not set: Source file extensions must be explicit.  Run
    "cmake --help-policy CMP0115" for policy details.  Use the cmake_policy
    command to set the policy and suppress this warning.

    File:

      /path/to/S-r/DCMTK/oflog/libsrc/nullap.cc
  Call Stack (most recent call first):
    oflog/libsrc/CMakeLists.txt:10 (DCMTK_ADD_LIBRARY)

Revision: 88d1a704a9fb4306666f53aa885aa7ba41258df8
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2021-03-23 4:36:30 PM
Message:
ENH: Update DCMTK from DCMTK-3.6.5 to patched-DCMTK-3.6.6_20210115

This commit updates to the version of DCMTK used in ee2c0a5c0.
It corresponds to the official DCMTK release DCMTK-3.6.6 [1] with an
extra backported patch [2]

[1] https://git.dcmtk.org/?p=dcmtk.git;a=commit;h=6cb30bd7fb42190e0188afbd8cb961c62a6fb9c9
[2] https://git.dcmtk.org/?p=dcmtk.git;a=commit;h=b665e2ec2d5ce435e28da6c938736dcfa84d0da6

Revision: eb86b67eb6998f43d935336c92f7529d1ab688f0
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2021-02-09 6:07:15 PM
Message:
COMP: Fix git repository URL used in VTK external project


Revision: 327977d0885fa6a2113c36e7d6e034c0e1b45c57
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2021-02-09 2:50:10 PM
Message:
ENH: Update DCMTK from DCMTK-3.6.1_20161102 to DCMTK-3.6.5

This commit updates to the version of DCMTK used in ac87bca5bf
and also updates the CMake build options to match settings used in Slicer.

Revision: a65ea3a71a52028dbe5af701bf5465cb1e184466
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2021-02-09 2:48:20 PM
Message:
ENH: Update ITK from v3.20.1 to v5.1.2

This commit updates to the version of ITK used in ac87bca5bf
and removes obsolete build options

Revision: f7a0da866c1ad87881e3f8bc2797cfc84d85d687
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2021-02-09 2:35:31 PM
Message:
COMP: Remove unmaintained and unused ZMQ external project

The dependency was originally introduced to be used in the CTKMessagingCore
library but this one has been removed in commontk/CTK@7f2c86ff6 (Removed
Messaging library.)

Revision: d831fe2a07e9a060d489bf4444f153d1445ad854
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2021-02-09 2:32:15 PM
Message:
COMP: Remove unmaintained and unused OpenIGTLink external project

For reference, OpenIGTLink has been removed from Slicer proper and moved
to an extension in 724edb05a (ENH: Remove support for
building OpenIGTLink now available as an extension)

Revision: ca7b6ad22cfcccc99810512fe45da532b0b19636
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2021-02-09 2:19:49 PM
Message:
COMP: Remove unmaintained integration of KWStyle


Revision: 7be004d768935e2fb292d9d1d68d3a4f652131c7
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2021-02-09 2:14:38 PM
Message:
COMP: Remove obsolete workaround including CTestUseLaunchers

Since minimum required CMake version is 3.0 and the fix has been
integrated in CMake 2.8.10 (see Kitware/CMake@d63eb0be2), this commit
removed the workaround originally introduced in commontk/CTK@4f9c61eb2.

Revision: b23b52d2c0fbe3da717895db41464f7c67bebf1d
Author: Steve Pieper <pieper@isomics.com>
Date: 2022-12-06 2:10:30 PM
Message:
Merge pull request #1057 from lassoan/fix-dicom-retrieve-crash

BUG: Fix crash in ctkDICOMQueryRetrieveWidget

Revision: d349b8750c220523cc124dd0be7bfdfeffe8cba7
Author: Andras Lasso <lasso@queensu.ca>
Date: 2022-12-05 7:49:12 PM
Message:
BUG: Fix crash in ctkDICOMQueryRetrieveWidget

After multiple queries with different criteria, the query/retrieve widget crashed due to null-pointer dereference.
It was not clear what led to the error, but the null-pointer check in this commit prevents the application from crashing, which is already an improvement.

Revision: 8f349212143bf23469a7e4c4f08617423a23538c
Author: Csaba Pinter <pinter.csaba@gmail.com>
Date: 2022-11-30 12:28:14 PM
Message:
ENH: Expose removeCachedTags method in Python

In automated tests it could be useful to explicitly clear the cache. This change allows doing that.

Revision: 87b18d82a7898a5461d84c2146cc0fa60f1e1ba1
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2022-11-02 12:39:14 AM
Message:
COMP: Fix CMake warning in DGraph project

This commit fixes the following warning:

  CMake Deprecation Warning at /home/jcfr/Projects/CTK/Utilities/DGraph/CMakeLists.txt:21 (cmake_minimum_required):
    Compatibility with CMake < 2.8.12 will be removed from a future version of
    CMake.

    Update the VERSION argument <min> value or use a ...<max> suffix to tell
    CMake that the project does not need compatibility with older versions.

Revision: 232899094a0c5da06cebc515b196a37cbdbcee36
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: 2022-11-01 11:37:47 PM
Message:
COMP: Fix CMake 3.15 warning in ctkLinkerAsNeededFlagCheck project

Adapted from 0c6ab39ca

This commit fixes the following warning:

  CMake Warning (dev) in /home/jcfr/Projects/CTK/CMake/ctkLinkerAsNeededFlagCheck/CMakeLists.txt:
    No project() command is present.  The top-level CMakeLists.txt file must
    contain a literal, direct call to the project() command.  Add a line of
    code such as

      project(ProjectName)

    near the top of the file, but after cmake_minimum_required().

    CMake is pretending there is a "project(Project)" command on the first
    line.
  This warning is for project developers.  Use -Wno-dev to suppress it.
  • Loading branch information
lassoan committed Jan 5, 2023
1 parent 210ad5e commit 7f5f83e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion SuperBuild/External_CTK.cmake
Expand Up @@ -73,7 +73,7 @@ if(NOT DEFINED CTK_DIR AND NOT Slicer_USE_SYSTEM_${proj})

ExternalProject_SetIfNotDefined(
Slicer_${proj}_GIT_TAG
"2c89539632e503e7cf9b7c53adccd8f1f71b2ead"
"dec834fccffebdc3b0896c157d39e3c0031c4a0a"
QUIET
)

Expand Down

0 comments on commit 7f5f83e

Please sign in to comment.