-
-
Notifications
You must be signed in to change notification settings - Fork 265
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
Remove old EXTERNALPROJECT_ADD in favor of FETCH_CONTENT #3624
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c2635da
Remove old EXTERNALPROJECT_ADD in favor of FETCH_CONTENT
byrnHDF 94807f1
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF 75f0256
Change sentence in note
byrnHDF a9772a9
Remove unused macros
byrnHDF 84e50a9
Merge branch 'develop' into develop-only-fc
byrnHDF File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,27 +9,41 @@ | |
| # If you do not have access to either file, you may request a copy from | ||
| # [email protected]. | ||
| # | ||
| option (PLUGIN_USE_EXTERNAL "Use External Library Building for filter PLUGIN" 0) | ||
|
|
||
| set (PLUGIN_USE_EXTERNAL "Use External Library Building for PLUGIN" 1) | ||
| if (NOT PLUGIN_USE_LOCALCONTENT) | ||
| set (PLUGIN_URL ${PLUGIN_TGZ_ORIGPATH}/${PLUGIN_TGZ_ORIGNAME}) | ||
| else () | ||
| if (NOT H5PL_TGZPATH) | ||
| set (H5PL_TGZPATH ${TGZPATH}) | ||
| endif () | ||
| set (PLUGIN_URL ${H5PL_TGZPATH}/${PLUGIN_TGZ_ORIGNAME}) | ||
| endif () | ||
| message (STATUS "Filter PLUGIN file is ${PLUGIN_URL}") | ||
|
|
||
| include (ExternalProject) | ||
| #option (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)" "NO") | ||
| set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)") | ||
| set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ) | ||
| if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") | ||
| option (PLUGIN_USE_EXTERNAL "Use External Library Building for filter PLUGIN" 1) | ||
| set (PLUGIN_USE_EXTERNAL "Use External Library Building for PLUGIN" 1) | ||
| if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT") | ||
| set (PLUGIN_URL ${PLUGIN_GIT_URL} CACHE STRING "Path to PLUGIN git repository") | ||
| set (PLUGIN_BRANCH ${PLUGIN_GIT_BRANCH}) | ||
| elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") | ||
| if (NOT TGZPATH) | ||
| set (TGZPATH ${HDF5_SOURCE_DIR}) | ||
| if (NOT H5PL_TGZPATH) | ||
| set (H5PL_TGZPATH ${TGZPATH}) | ||
| endif () | ||
| set (PLUGIN_URL ${TGZPATH}/${PLUGIN_TGZ_NAME}) | ||
| if (NOT EXISTS "${PLUGIN_URL}") | ||
| set (HDF5_ENABLE_PLUGIN_SUPPORT OFF CACHE BOOL "" FORCE) | ||
| message (STATUS "Filter PLUGIN file ${PLUGIN_URL} not found") | ||
| if (PLUGIN_USE_LOCALCONTENT) | ||
| if (NOT EXISTS "${PLUGIN_URL}") | ||
| set (HDF5_ENABLE_PLUGIN_SUPPORT OFF CACHE BOOL "" FORCE) | ||
| message (VERBOSE "Filter PLUGIN file ${PLUGIN_URL} not found") | ||
| endif () | ||
| endif () | ||
| else () | ||
| set (PLUGIN_USE_EXTERNAL 0) | ||
| message (VERBOSE "Filter PLUGIN not built") | ||
| endif () | ||
| endif () | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,14 @@ | ||
| # | ||
| # Copyright by The HDF Group. | ||
| # All rights reserved. | ||
| # | ||
| # This file is part of HDF5. The full HDF5 copyright notice, including | ||
| # terms governing use, modification, and redistribution, is contained in | ||
| # the COPYING file, which can be found at the root of the source code | ||
| # distribution tree, or in https://www.hdfgroup.org/licenses. | ||
| # If you do not have access to either file, you may request a copy from | ||
| # [email protected]. | ||
| # | ||
| #------------------------------------------------------------------------------- | ||
| # Plugins must be built SHARED | ||
| #------------------------------------------------------------------------------- | ||
|
|
@@ -85,16 +96,16 @@ macro (FILTER_OPTION plname) | |
| if (ENABLE_${plname}) | ||
| option (HDF_${plname}_USE_EXTERNAL "Use External Library Building for ${PLUGIN_NAME} plugin" 0) | ||
| mark_as_advanced (HDF_${plname}_USE_EXTERNAL) | ||
| if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") | ||
| if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") | ||
| set (HDF_${plname}_USE_EXTERNAL 1 CACHE BOOL "Use External Library Building for ${PLUGIN_NAME} plugin" FORCE) | ||
| if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT") | ||
| if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT") | ||
| set (HDF_${plname}_URL ${HDF_${plname}_GIT_URL}) | ||
| set (HDF_${plname}_BRANCH ${HDF_${plname}_GIT_BRANCH}) | ||
| elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") | ||
| if (NOT TGZPATH) | ||
| set (TGZPATH ${H5PL_SOURCE_DIR}) | ||
| elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") | ||
| if (NOT H5PL_COMP_TGZPATH) | ||
| set (H5PL_COMP_TGZPATH ${H5PL_SOURCE_DIR}/libs) | ||
| endif () | ||
| set (HDF_${plname}_URL ${TGZPATH}/${HDF_${plname}_TGZ_NAME}) | ||
| set (HDF_${plname}_URL ${H5PL_COMP_TGZPATH}/${HDF_${plname}_TGZ_NAME}) | ||
| endif () | ||
| endif () | ||
| add_subdirectory (${plname}) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this was the only place this is used. Should remove the macro at this point?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Possibly yes