From 0ac88bc688c24ca269adfc0852753567b024e98d Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 3 Nov 2021 15:36:49 -0600 Subject: [PATCH 1/2] Remove unused vars and commented-out debug statements (trilinos/Trilinos#9894) The unused var was used in debug print statements which is also removed here. --- .../core/utils/TribitsGatherBuildTargets.cmake | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tribits/core/utils/TribitsGatherBuildTargets.cmake b/tribits/core/utils/TribitsGatherBuildTargets.cmake index 021e11b3f..6056d777f 100644 --- a/tribits/core/utils/TribitsGatherBuildTargets.cmake +++ b/tribits/core/utils/TribitsGatherBuildTargets.cmake @@ -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) From 757c0235b809b8633405567523cf63a1068a4b9f Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 3 Nov 2021 16:05:02 -0600 Subject: [PATCH 2/2] Fix typos in doc from review feedback (trilinos/Trilinos#9894) --- tribits/ReleaseNotes.txt | 4 ++-- tribits/examples/TribitsExampleApp/README.md | 2 +- .../packages/wrap_external/CMakeLists.txt | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tribits/ReleaseNotes.txt b/tribits/ReleaseNotes.txt index 83103a2e4..edf524e7a 100644 --- a/tribits/ReleaseNotes.txt +++ b/tribits/ReleaseNotes.txt @@ -8,7 +8,7 @@ Release Notes for TriBITS the build directory tree have been moved from `/packages//` to `/cmake_packages//`. This makes it easy for - `find_package()` to fine these files by simply adding the + `find_package()` to find these files by simply adding the directory ``/cmake_packages` to `CMAKE_PREFIX_PATH` and then `Config.cmake` for any enabled package will be found automatically found by CMake. @@ -19,7 +19,7 @@ Release Notes for TriBITS has been removed along with the cache variable _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: diff --git a/tribits/examples/TribitsExampleApp/README.md b/tribits/examples/TribitsExampleApp/README.md index e80b7ee88..8eb50298b 100644 --- a/tribits/examples/TribitsExampleApp/README.md +++ b/tribits/examples/TribitsExampleApp/README.md @@ -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 diff --git a/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt b/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt index 68e76a335..c92492464 100644 --- a/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt +++ b/tribits/examples/TribitsExampleProject/packages/wrap_external/CMakeLists.txt @@ -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: # @@ -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)