Skip to content

Commit

Permalink
Merge Pull Request #9663 from bartlettroscoe/Trilinos/tribits-snapsho…
Browse files Browse the repository at this point in the history
…t-2021-09-03

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: TriBITS Snapshot update as of 2021-09-03
PR Author: bartlettroscoe
  • Loading branch information
trilinos-autotester committed Sep 10, 2021
2 parents 68f1949 + bdc56f5 commit 42120c4
Show file tree
Hide file tree
Showing 438 changed files with 18,333 additions and 16,470 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ INCLUDE("${CMAKE_CURRENT_LIST_DIR}/SetUtils.cmake")
TRIL_SET_BOOL_CACHE_VAR(${PROJECT_NAME}_ENABLE_OpenMP ON)

TRIL_SET_CACHE_VAR(MPI_EXEC_PRE_NUMPROCS_FLAGS "--bind-to;none"
CACHE STSRING)
CACHE STRING)
# NOTE: The above is a workaround for the problem of having threads on MPI
# ranks bind to the same cores (see #2422).

Expand Down
2 changes: 1 addition & 1 deletion cmake/std/sems/get_default_modules.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PLATFORM_TYPE=`uname`

if [ "$PLATFORM_TYPE" = "Linux" ] ; then
sems_compiler_and_version_default=sems-gcc/5.3.0
sems_compiler_and_version_default=sems-gcc/7.2.0
elif [ "$PLATFORM_TYPE" = "Darwin" ] ; then
sems_compiler_and_version_default=sems-gcc/5.3.0
else
Expand Down
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 42120c4

Please sign in to comment.