Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update external projects #951

Merged
merged 13 commits into from
Dec 14, 2022
Merged

Conversation

jcfr
Copy link
Member

@jcfr jcfr commented Feb 9, 2021

  • Update default Qt version from 4 to 5
  • Remove obsolete workaround including CTestUseLaunchers
  • Remove unmaintained integration of KWStyle
  • Remove unmaintained and unused OpenIGTLink external project
  • Remove unmaintained and unused ZMQ external project
  • Update ITK from v3.20.1 to v5.1.2
  • Update QtTesting to support building against C++98
  • DMCTK
    • Update DCMTK from DCMTK-3.6.1_20161102 to DCMTK-3.6.5
    • Update DCMTK from DCMTK-3.6.5 to patched-DCMTK-3.6.6_20210115
    • Update DCMTK to fix CMP0115 CMake warnings
    • Disable DCMTK ICU default for Superbuild
  • VTK
    • Fix git repository URL used in VTK external project
    • Update VTK to v8.0.1 to support Qt4, to v9.2.2 to support Qt5

@jcfr jcfr requested review from pieper and lassoan February 9, 2021 19:52
@jcfr

This comment was marked as outdated.

@jcfr

This comment was marked as outdated.

@lassoan
Copy link
Member

lassoan commented Feb 9, 2021

I did not update VTK as the current external project aims to support both Qt4 and Qt5 and in Slice we removed Qt4 support a while back.

Users can use whatever versions they need, but we can still set Qt 5 and VTK 8 or 9 as default when someone does not specify any VTK and Qt versions.

@jriesmeier
Copy link

FYI: DCMTK 3.6.6 has been released only recently.

jcfr and others added 12 commits December 13, 2022 23:26
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.
For reference, OpenIGTLink has been removed from Slicer proper and moved
to an extension in Slicer/Slicer@724edb05a (ENH: Remove support for
building OpenIGTLink now available as an extension)
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.)
This commit updates to the version of ITK used in Slicer/Slicer@ac87bca5bf
and removes obsolete build options
This commit updates to the version of DCMTK used in Slicer/Slicer@ac87bca5bf
and also updates the CMake build options to match settings used in Slicer.
Adapted from Slicer/Slicer@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)
Adapted from Slicer/Slicer@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 <[email protected]>
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.
* 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 Slicer/Slicer@23d814488 (BUG: Fix linux
  package removing dependency to GLVND libraries)
@jcfr jcfr linked an issue Dec 14, 2022 that may be closed by this pull request
@jcfr jcfr merged commit 1abb81e into commontk:master Dec 14, 2022
@jcfr jcfr deleted the update-external-projects branch December 14, 2022 04:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants