Skip to content

Commit

Permalink
Merge branch 'tribits_github_snapshot' into tribits-snapshot-2021-09-03
Browse files Browse the repository at this point in the history
Brings in numerous refactorings to TriBITS over the last 3 months, but there
should be no breaks in backward compatibility.  Almost every file in TriBITS
is changed due to the lower-casing of command, macro and function names in PR
TriBITSPub/TriBITS#379.  But the main driver for this snapshot is to bring in
the change in PR TriBITSPub/TriBITS#413 that should make it so that Kokkos
INTERFACE_COMPILE_OPTIONS get propagated to downstream targets in TriBITS and
therefore to external customers through installed <Package>Config.cmake files
and IMPORTED targets.  I should have done several snapshots in the last few
months and not done a big snapshot like this (but I have been testing with
Trilinos locally along the way).

Overall, this merge brings in changes from a bunch of TriBITS PRs including
(from most recent):

* TriBITSPub/TriBITS#413: Change internal TriBITS target_link_libraries() to
  PUBLIC (TriBITSPub/TriBITS#299) component: core type: enhancement

* TriBITSPub/TriBITS#410: Upgrade from cmake 3.21.0 to 3.21.2
  (TriBITSPub/TriBITS#363, TriBITSPub/TriBITS#394)

* TriBITSPub/TriBITS#394: DO NOT MERGE: Show TriBITS test failures with CMake
  3.21.0 that don't occur with CMake 3.17.5 (TriBITSPub/TriBITS#363)

* TriBITSPub/TriBITS#409: Add getTestDictStatusField() to handle empty
  'status' field (SESW-383) component: ci_support type: enhancement

* TriBITSPub/TriBITS#408: Deal with spaces in CDash url parts (SESW-383)
  component: ci_support type: enhancement

* TriBITSPub/TriBITS#403: Spelling fixes

* TriBITSPub/TriBITS#407: Move tribits_get_build_url_and_write_to_file() to
  stand-alone module (TriBITSPub/TriBITS#154) component: ctest_driver type:
  enhancement

* TriBITSPub/TriBITS#388: Fixing typos (TriBITSPub/TriBITS#377)

* TriBITSPub/TriBITS#406: Fix tribits_ctest_driver() package-by-package mode
  for CMake 3.19+ (TriBITSPub/TriBITS#363, TriBITSPub/TriBITS#394) component:
  ctest_driver type: bug

* TriBITSPub/TriBITS#401: Improve GitHub Actions and CDash integration
  (TriBITSPub/TriBITS#154) type: enhancement

* TriBITSPub/TriBITS#366: CI: draft action yaml

* TriBITSPub/TriBITS#402: Revert some incorrect uppercase->lowercase changes

* TriBITSPub/TriBITS#387: Build and deploy TriBITS documentation with Sphinx
  (TriBITSPub/TriBITS#386) component: documentation type: enhancement

* TriBITSPub/TriBITS#398: Deal with pr null in not preprending build name
  (TriBITSPub/TriBITS#363) type: bug

* TriBITSPub/TriBITS#396: Send PR results to 'Pull Request' CDash group and
  add PR ID to build names (TriBITSPub/TriBITS#363) type: enhancement

* TriBITSPub/TriBITS#397: Print the ninja path and version
  (TriBITSPub/TriBITS#363)

* TriBITSPub/TriBITS#393: GitHub Actions based testing for TriBITS
  (TriBITSPub/TriBITS#363) type: enhancement

* TriBITSPub/TriBITS#389: TriBITS CI testing with GitHub Actions
  (TriBITSPub/TriBITS#363) type: enhancement

* TriBITSPub/TriBITS#392: Fix broken tests for non-Fortran and CMake 3.21
  builds (TriBITSPub/TriBITS#363) component: core

* TriBITSPub/TriBITS#391: Fix up build_docs.sh for Sphinx doc generation
  (TriBITSPub/TriBITS#386) component: documentation type: enhancement

* TriBITSPub/TriBITS#390: Add test for doc generation and fix usage of Python3
  component: documentation type: bug

* TriBITSPub/TriBITS#385: Replace last few references to
  TribitsDevelopersGuide.html (TriBITSPub/TriBITS#381) component:
  documentation type: enhancement

* TriBITSPub/TriBITS#384: Split TribitsDevelopersGuide.* into
  TribitsUsersGuide.* and TribitsMaintainersGuide.* (TriBITSPub/TriBITS#381)
  component: documentation type: enhancement

* TriBITSPub/TriBITS#383: Remove endfunction(<string>) and endmacro(<string>)
  (TriBITSPub/TriBITS#274, TriBITSPub/TriBITS#382) component: common_tpls
  type: bug

* TriBITSPub/TriBITS#380: More package-arch data-structure documentation
  updates (TriBITSPub/TriBITS#63) component: documentation type: enhancement

* TriBITSPub/TriBITS#379: Convert TriBITS to lower-case CMake command, macro,
  and function names (TriBITSPub/TriBITS#274)

The following files were conflicting where I went with what is on the Trilinos
'develop' branch:

* cmake/tribits/common_tpls/FindTPLBLAS.cmake
* cmake/tribits/common_tpls/FindTPLLAPACK.cmake
* cmake/tribits/common_tpls/FindTPLNetcdf.cmake

(It looks like the above changes never made it back into TriBITS proper.  The
conflicts were due to the case changes in cmake command calls in these files
due to TriBITSPub/TriBITS#379.)

There was also a conflict in the file:

* cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in

I looked at that one carefully and I think that may have been due to fixes on
both sides and then the case changes from TriBITSPub/TriBITS#379.
  • Loading branch information
bartlettroscoe committed Sep 3, 2021
2 parents 862f9d6 + 2beb906 commit 3c77011
Show file tree
Hide file tree
Showing 434 changed files with 18,328 additions and 16,465 deletions.
16 changes: 13 additions & 3 deletions cmake/tribits/ReleaseNotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
Release Notes for TriBITS
----------------------------------------

2021/06/17:

(*) MINOR: Added tool tribits/python_utils/lower_case_cmake.py and driver
tribits/refactoring/lower-case-cmake-tree.sh that can make CMake command
calls lower-case and make macro and function definition names lowe case.
This was applied to the entire TriBITS repository (and then minor
modifications for fix a few issues). This should not impact users of
TriBITS but it does change the case of commands in the TriBITS error
messages. (See TriBITSPub/TriBITS#274)

2021/05/15:

(*) MAJOR: Changed so that all arguments passed to ctest -S command in
Expand Down Expand Up @@ -267,10 +277,10 @@ Trilinos 11.3:
TRIBITS_ADD_EXECUTABLE_AND_TEST().

(*) MINOR: TriBITS Core: Fixed the generation of headers for explicit
instantation system for subpackages: Now subpackages that use the macro
instantiation system for subpackages: Now subpackages that use the macro
TRIBITS_CREATE_CLIENT_TEMPLATE_HEADERS() to generate XXX.hpp header files
with or without explicit instantation will key off of the parent package's
explicit instantation setting. In addition, packages that use the macro
with or without explicit instantiation will key off of the parent package's
explicit instantiation setting. In addition, packages that use the macro
TRIBITS_CREATE_CLIENT_TEMPLATE_HEADERS() will also need to add a call to
TRIBITS_ADD_EXPLICIT_INSTANTIATION_OPTION() in their top-level
CMakeLists.txt file.
Expand Down
22 changes: 11 additions & 11 deletions cmake/tribits/TriBITS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
# Top-level include file that pulls in TriBITS so it can be used by a project.
# A Project's top-level CMakeLists.cmake file just does:
#
# INCLUDE(${${PROJECT_NAME}_TRIBITS_DIR}/TriBITS.cmake)
# include(${${PROJECT_NAME}_TRIBITS_DIR}/TriBITS.cmake)
#
# and then they can call:
#
# TRIBITS_PROJECT()
# tribits_project()
#

IF (${PROJECT_NAME}_TRIBITS_DIR)
SET(TRIBITS_BASE_DIR_LOCAL "${${PROJECT_NAME}_TRIBITS_DIR}")
ELSEIF(CMAKE_CURRENT_LIST_DIR)
SET(TRIBITS_BASE_DIR_LOCAL "${CMAKE_CURRENT_LIST_DIR}")
ELSE()
MESSAGE(FATAL_ERROR "Please set ${PROJECT_NAME}_TRIBITS_DIR!")
ENDIF()
if (${PROJECT_NAME}_TRIBITS_DIR)
set(TRIBITS_BASE_DIR_LOCAL "${${PROJECT_NAME}_TRIBITS_DIR}")
elseif(CMAKE_CURRENT_LIST_DIR)
set(TRIBITS_BASE_DIR_LOCAL "${CMAKE_CURRENT_LIST_DIR}")
else()
message(FATAL_ERROR "Please set ${PROJECT_NAME}_TRIBITS_DIR!")
endif()

INCLUDE("${TRIBITS_BASE_DIR_LOCAL}/core/package_arch/TribitsProject.cmake")
INCLUDE("${TRIBITS_BASE_DIR_LOCAL}/Version.cmake")
include("${TRIBITS_BASE_DIR_LOCAL}/core/package_arch/TribitsProject.cmake")
include("${TRIBITS_BASE_DIR_LOCAL}/Version.cmake")
16 changes: 8 additions & 8 deletions cmake/tribits/Version.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
IF ("${REPOSITORY_NAME}" STREQUAL "")
SET(REPOSITORY_NAME TriBITS)
ENDIF()
if ("${REPOSITORY_NAME}" STREQUAL "")
set(REPOSITORY_NAME TriBITS)
endif()

SET(${REPOSITORY_NAME}_VERSION 0.9)
SET(${REPOSITORY_NAME}_MAJOR_VERSION 00)
SET(${REPOSITORY_NAME}_MAJOR_MINOR_VERSION 000900)
SET(${REPOSITORY_NAME}_VERSION_STRING "0.9 (Dev)")
SET(${REPOSITORY_NAME}_ENABLE_DEVELOPMENT_MODE_DEFAULT ON) # Change to 'OFF' for a release
set(${REPOSITORY_NAME}_VERSION 0.9)
set(${REPOSITORY_NAME}_MAJOR_VERSION 00)
set(${REPOSITORY_NAME}_MAJOR_MINOR_VERSION 000900)
set(${REPOSITORY_NAME}_VERSION_STRING "0.9 (Dev)")
set(${REPOSITORY_NAME}_ENABLE_DEVELOPMENT_MODE_DEFAULT ON) # Change to 'OFF' for a release
Loading

0 comments on commit 3c77011

Please sign in to comment.