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

COMP: Fix configuration referencing README.md #7203

Merged
merged 1 commit into from
Aug 29, 2023

Conversation

jcfr
Copy link
Member

@jcfr jcfr commented Aug 29, 2023

Fix regression introduced in 2fe5bde (DOC: Convert README to markdown for adding of badges) through #7197

Fix regression introduced in 2fe5bde (DOC: Convert README to markdown
for adding of badges)
@jcfr
Copy link
Member Author

jcfr commented Aug 29, 2023

This is still failing because (1) the the variable is already set in the CMakeCache.txt (the CI only perform the inner-build) and (2) the SlicerReadApplicationProperties() function do not override the value if already set in the caller scope.

# Set property value if not already defined in caller scope
if(NOT DEFINED ${MY_PROJECT_NAME}_${property_name})
set(default_value ${${property_name}})
set(${MY_PROJECT_NAME}_${property_name} "${default_value}" PARENT_SCOPE)
endif()
mark_as_superbuild(${MY_PROJECT_NAME}_${property_name})

After locally modifying the cache, the configuration works as expected:

[...]
-- --------------------------------------------------
-- Configuring Slicer application library: qSlicerApp
-- --------------------------------------------------
-- Setting Slicer DESCRIPTION_SUMMARY to 'Medical Visualization and Processing Environment for Research'
-- Setting Slicer DESCRIPTION_FILE to '/home/jcfr/Projects/Slicer/README.md'
-- --------------------------------------------------
-- Configuring Slicer application: SlicerApp
-- --------------------------------------------------
[...]
-- Setting CPACK_PACKAGE_VERSION to '5.5.0-2023-08-29'
-- Setting CPACK_PACKAGE_INSTALL_DIRECTORY to 'Slicer 5.5.0-2023-08-29'
-- Setting CPACK_PACKAGE_DESCRIPTION_FILE to '/home/jcfr/Projects/Slicer/README.md'
-- Setting CPACK_RESOURCE_FILE_LICENSE to '/home/jcfr/Projects/Slicer/License.txt'
-- Setting CPACK_PACKAGE_DESCRIPTION_SUMMARY to 'Medical Visualization and Processing Environment for Research'
-- Configuring done
-- Generating done
-- Build files have been written to: /home/jcfr/Projects/Slicer-Release/Slicer-build

@jcfr jcfr merged commit 50beca5 into Slicer:main Aug 29, 2023
4 of 5 checks passed
@jcfr jcfr deleted the fix-build-referencing-readme-md branch August 29, 2023 06:20
@jcfr
Copy link
Member Author

jcfr commented Aug 29, 2023

⚡ 🚀 Dashboard entries have been removed and preview builds for Linux, macOS and Windows have been manually1 re-triggered.

Footnotes

  1. https://github.com/Slicer/DashboardScripts/blob/main/maintenance/guides/re-trigger-nightly-build.md

jcfr referenced this pull request Sep 27, 2023
Qt lupdate threw warnings about unconsumed metadata for lines that had translator's comments (that is exported to the language translation file to provide additonal context for translators) in the same line as the translatable text. For example:

    this->SupportedReadFileTypes->InsertNextValue(vtkMRMLTr("vtkMRMLColorTableStorageNode", "MRML Color Table") + " (.ctbl)");  //: file format name

The issue with this is that Qt expects translator comment to be in the previous line like this:

    //: File format name
    this->SupportedReadFileTypes->InsertNextValue(vtkMRMLTr("vtkMRMLColorTableStorageNode", "MRML Color Table") + " (.ctbl)");
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant