forked from TriBITSPub/TriBITS
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
WIP: Add failing test with call to tribits_disable_optional_dependency()
This adds a failing test for the call of tribits_disable_optional_dependency() discovered while testing the Trilinos PR trilinos/Trilinos#12291. Some other changes as part of this: * Add optional argument PACKAGE_NAME <packageName> to macro tribits_disable_optional_dependency() to allow the disable of a subpackage's dependency from its parent package's CMakeList.txt file. * Added new function tribits_get_have_package_dependency_macro_name(...) to eliminate code duplication for the naming of the HAVE_<PACKAGE_NAME_UC>_<UPSTREAM_PACKAGE_UC> macro.
- Loading branch information
1 parent
4be87d2
commit e16191e
Showing
5 changed files
with
45 additions
and
11 deletions.
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
9 changes: 9 additions & 0 deletions
9
tribits/core/package_arch/TribitsGetHavePackageDependencyMacroName.cmake
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 |
---|---|---|
@@ -0,0 +1,9 @@ | ||
function(tribits_get_have_package_dependency_macro_name packageName upstreamPackageName | ||
haveDepMacroNameOut | ||
) | ||
string(TOUPPER ${packageName} packageName_UC) | ||
string(TOUPPER ${upstreamPackageName} upstreamPackageName_UC) | ||
set(haveDepMacroName | ||
HAVE_${packageName_UC}_${upstreamPackageName_UC}) | ||
set(${haveDepMacroNameOut} ${haveDepMacroName} PARENT_SCOPE) | ||
endfunction() |
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