Remove endfunction(<string>) and endmacro(<string>) (#274, #382)

[bartlettroscoe]

Resolves #382.

Follow-on to #274 and PR #379. See more details in commit e9ea581

[bartlettroscoe]

@gsjaardema, can you please accept the invite for write access to this repo and review and approve this PR (since this is your code)? Note that it is generally considered best practice not to include an argument in end<statement>() commands. See here and here.

[bartlettroscoe]

With the ATDM Trilinos 'cee-rhel7-clang-opt' build on the machine 'ceerws1113' using:

$ cd /scratch/rabartl/Trilinos.base/BUILDS/ATDM/CEE-RHEL7/CHECKIN/cee-rhel7-clang-opt/

$ cat load-env.sh 
source /scratch/rabartl/Trilinos.base/Trilinos/cmake/std/atdm/load-env.sh cee-rhel7-clang-opt

$ . load-env.sh 
Hostname 'ceerws1113' matches known ATDM host 'ceerws1113' and system 'cee-rhel7'
Setting compiler and build options for build-name 'cee-rhel7-clang-opt'
Using CEE RHEL7 compiler stack CLANG-9.0.1_OPENMPI-4.0.3 to build RELEASE code with Kokkos node type SERIAL

$ cat do-configure.base
cmake \
-GNinja \
-DTrilinos_TRIBITS_DIR:STRING=TriBITS/tribits \
-DTrilinos_ENABLE_TESTS:BOOL=ON \
-DTrilinos_TEST_CATEGORIES:STRING=NIGHTLY \
-DTrilinos_ALLOW_NO_PACKAGES:BOOL=OFF \
-DDART_TESTING_TIMEOUT:STRING=600.0 \
-GNinja \
-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/atdm/ATDMDevEnv.cmake \
-DTrilinos_TRACE_ADD_TEST=ON \
"$@" \
/scratch/rabartl/Trilinos.base/Trilinos/cmake/std/atdm/../../..

$ cat do-configure
./do-configure.base \
-DTrilinos_ENABLE_SEACAS:BOOL=ON \
-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \
-DTrilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES:BOOL=OFF \
"$@"

$ rm -r CMake*

$ ./do-configure &> configure.out

$ grep "CMake Warning" configure.out | wc -l
14

I was able to reproduce the warnings reported in #382 showing, for example:

-- Using find_package(Netcdf ...) ...
CMake Warning (dev) in TriBITS/tribits/common_tpls/utils/ParseLibraryList.cmake:
  A logical block opening on the line

    /scratch/rabartl/Trilinos.base/Trilinos/TriBITS/tribits/common_tpls/utils/ParseLibraryList.cmake:51 (function)

  closes on the line

    /scratch/rabartl/Trilinos.base/Trilinos/TriBITS/tribits/common_tpls/utils/ParseLibraryList.cmake:115 (endfunction)

  with mis-matching arguments.
Call Stack (most recent call first):
  TriBITS/tribits/common_tpls/utils/AddPackageDependency.cmake:51 (include)
  TriBITS/tribits/common_tpls/find_modules/FindNetCDF.cmake:72 (include)
  TriBITS/tribits/common_tpls/FindTPLNetcdf.cmake:66 (find_package)
  TriBITS/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake:106 (include)
  TriBITS/tribits/core/package_arch/TribitsGlobalMacros.cmake:1604 (tribits_process_enabled_tpl)
  TriBITS/tribits/core/package_arch/TribitsProjectImpl.cmake:196 (tribits_process_enabled_tpls)
  TriBITS/tribits/core/package_arch/TribitsProject.cmake:93 (tribits_project_impl)
  CMakeLists.txt:109 (TRIBITS_PROJECT)
This warning is for project developers.  Use -Wno-dev to suppress it.

Then switching over the the version of TriBITS in this PR branch 'checkout 382-remove-endfunction-endmacro-strings', I again ran:

$ rm -r CMake*

$ ./do-configure &> configure.out

$ tail -n 5 configure.out
Finished configuring Trilinos!

-- Configuring done
-- Generating done
-- Build files have been written to: /scratch/rabartl/Trilinos.base/BUILDS/ATDM/CEE-RHEL7/CHECKIN/cee-rhel7-clang-opt

$ grep "CMake Warning" configure.out | wc -l
0

So I think this should be good to merge.

[gsjaardema]

@bartlettroscoe Looks good. Sorry for the delay, did not see this until now.