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.

Sign up for GitHub

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

Address review feedback from trilinos/Trilinos#9894 #430

Merged
merged 2 commits into from
Nov 5, 2021
Merged

Address review feedback from trilinos/Trilinos#9894 #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ac88bc
Remove unused vars and commented-out debug statements (trilinos/Trili…
bartlettroscoe Nov 3, 2021
757c023
Fix typos in doc from review feedback (trilinos/Trilinos#9894)
bartlettroscoe Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tribits/ReleaseNotes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Release Notes for TriBITS
the build directory tree have been moved from
`<buildDir>/packages/<packageDir>/` to
`<buildDir>/cmake_packages/<PackageName>/`. This makes it easy for
`find_package(<PackageName>)` to fine these files by simply adding the
`find_package(<PackageName>)` to find these files by simply adding the
directory ``<buildDir>/cmake_packages` to `CMAKE_PREFIX_PATH` and then
`<Package>Config.cmake` for any enabled package will be found
automatically found by CMake.
Expand All @@ -19,7 +19,7 @@ Release Notes for TriBITS
has been removed along with the cache variable
<Project>_ENABLE_EXPORT_MAKEFILES. This is to allow the refactoring of
TriBITS to use modern CMake targets that propagate all information and
removing complex dependency tracking inforamtion from TriBITS (see
removing complex dependency tracking information from TriBITS (see
TriBITSPub/TriBITS#63 and TriBITSPub/TriBITS#299).

2021/06/17:
Expand Down
16 changes: 0 additions & 16 deletions tribits/core/utils/TribitsGatherBuildTargets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,32 +87,16 @@ function(tribits_filter_only_build_targets targetListInVar targetTypesList
targetListOutVar
)

#message("\ntribits_filter_only_build_targets:\n")
#print_var(targetListInVar)
#print_var(targetTypesList)
#print_var(targetListInVar)
#print_var(${targetListInVar})

set(targetListOut "")

foreach (target IN LISTS ${targetListInVar})
#message("")
#print_var(target)
get_property(targetType TARGET ${target} PROPERTY TYPE)
set(matchedDesiredTargetType FALSE)
#print_var(targetType)
foreach (desiredTargetType IN ITEMS ${targetTypesList})
#print_var(desiredTargetType)
if (desiredTargetType STREQUAL targetType)
#message("-- " "${target} is a filtered-for build target!")
list(APPEND targetListOut ${target})
set(matchedDesiredTargetType TRUE)
break()
endif()
endforeach()
#if (NOT matchedDesiredTargetType)
# message("-- " "${target} is **NOT** a filtered-for build target!")
#endif()
endforeach()

set(${targetListOutVar} ${targetListOut} PARENT_SCOPE)
Expand Down
2 changes: 1 addition & 1 deletion tribits/examples/TribitsExampleApp/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ That essentially results in calling:
)
```

(but does so with a loop and a list internally obviously).
(but does so with a loop and a list internally).


## Pulling in packages from the build tree
Expand Down
5 changes: 2 additions & 3 deletions tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# configured and built piece of software. The external software once built
# provides libraries that need to be cast as TriBITS CMake libraries. To
# make this even more interesting, the external software has dependencies on
# upstream TriBITS packages that it pulls in through a TriBITS export
# makefile.
# upstream TriBITS packages.
#
# An overview of the basic tasks required are:
#
Expand Down Expand Up @@ -62,7 +61,7 @@ endif()
# start from scratch.

#
# B) Get the arguments for the configure of exteranl_func
# B) Get the arguments for the configure of external_func
#

string(TOUPPER "${CMAKE_BUILD_TYPE}" upperBuildType)
Expand Down