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

Disable FITS test when not building with CFITSIO support. Fix build without libTIFF. #4866

Merged
merged 2 commits into from
May 24, 2023

Conversation

mzient
Copy link
Contributor

@mzient mzient commented May 24, 2023

Category:

Bug fix (non-breaking change which fixes an issue)

Description:

This PR fixes broken test build without CFITSIO support. It also fixes long-broken build without libtiff (it relied on some environment variables that we set in our CI, but which are not mandatory).

Additional information:

Affected modules and functionalities:

Key points relevant for the review:

Tests:

  • Existing tests apply
  • New tests added
    • Python tests
    • GTests
    • Benchmark
    • Other
  • N/A

Checklist

Documentation

  • Existing documentation applies
  • Documentation updated
    • Docstring
    • Doxygen
    • RST
    • Jupyter
    • Other
  • N/A

DALI team only

Requirements

  • Implements new requirements
  • Affects existing requirements
  • N/A

REQ IDs: N/A

JIRA TASK: N/A

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
@klecki klecki self-assigned this May 24, 2023
@@ -19,7 +19,7 @@ collect_test_sources(DALI_TEST_SRCS PARENT_SCOPE)

if (NOT BUILD_LIBTIFF)
list(REMOVE_ITEM DALI_SRCS
${DALI_SRC_DIR}/dali/image/tiff_libtiff.cc
${CMAKE_CURRENT_SOURCE_DIR}/tiff_libtiff.cc
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Setting DALI_SRC_DIR is not mandatory and it didn't work with a local build.

@mzient mzient changed the title Disable FITS test when not building with CFITSIO support. Disable FITS test when not building with CFITSIO support. Fix build without libTIFF. May 24, 2023
@awolant awolant self-assigned this May 24, 2023
@dali-automaton
Copy link
Collaborator

CI MESSAGE: [8396633]: BUILD STARTED

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [8396633]: BUILD FAILED

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [8396633]: BUILD PASSED

@JanuszL JanuszL merged commit 1dceee7 into NVIDIA:main May 24, 2023
JanuszL pushed a commit to JanuszL/DALI that referenced this pull request Oct 13, 2023
…ithout libTIFF. (NVIDIA#4866)

* Disable FITS test when not building with CFITSIO support.

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants