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

BUG: fix installation of the generated file expat_config.h #2786

Merged
merged 1 commit into from
Oct 8, 2021

Conversation

SimonRit
Copy link

@SimonRit SimonRit commented Oct 8, 2021

PR Checklist

  • No API changes were made (or the changes have been approved)
  • No major design changes were made (or the changes have been approved)
  • Added test (or behavior not changed)
  • Updated API documentation (or API not changed)
  • Added license to new files (if any)
  • Added Python wrapping to new files (if any) as described in ITK Software Guide Section 9.5
  • Added ITK examples for all new major features (if any)

Refer to the ITK Software Guide for
further development details if necessary.

@github-actions github-actions bot added area:ThirdParty Issues affecting the ThirdParty module type:Bug Inconsistencies or issues which will cause an incorrect result under some or all circumstances type:Infrastructure Infrastructure/ecosystem related changes, such as CMake or buildbots labels Oct 8, 2021
@@ -195,7 +195,7 @@ INSTALL(TARGETS ITKEXPAT
INSTALL(FILES
${ITK3P_EXPAT_BINARY_DIR}/expatDllConfig.h
${ITK3P_EXPAT_SOURCE_DIR}/expat.h
${ITK3P_EXPAT_SOURCE_DIR}/expat_config.h
${CMAKE_CURRENT_BINARY_DIR}/expat_config.h
Copy link
Member

Choose a reason for hiding this comment

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

Should this be ITK3P_EXPAT_BINARY_DIR, same as two lines above?

Copy link
Author

Choose a reason for hiding this comment

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

Should this be ITK3P_EXPAT_BINARY_DIR, same as two lines above?

My patch was based on how expat_config.h is generated. 9b74f7b accounts for your suggestion and makes the generation of expat_config.h consistent. I'm not sure if ITK3P_EXPAT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR can differ and, if yes, what's the best solution... @agravgaard may want to comment on his code.

Copy link
Member

@thewtex thewtex left a comment

Choose a reason for hiding this comment

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

Thanks @SimonRit !

@thewtex thewtex merged commit 69b7c4e into InsightSoftwareConsortium:master Oct 8, 2021
@SimonRit SimonRit deleted the ExpatInstall branch October 11, 2021 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:ThirdParty Issues affecting the ThirdParty module type:Bug Inconsistencies or issues which will cause an incorrect result under some or all circumstances type:Infrastructure Infrastructure/ecosystem related changes, such as CMake or buildbots
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants