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.

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

TriBITS Snapshot 2022-12-12 working toward TriBITSPub/TriBITS#63 #11380

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
808def3
Automatic snapshot commit from tribits at 07aeef0f
bartlettroscoe Dec 13, 2022
fb29940
Merge branch 'tribits_github_snapshot' into develop (TriBITSPub/TriBI…
bartlettroscoe Dec 13, 2022
67e32ad
GTest: Remove usage of deprecated include_directories() (TriBITSPub/T…
bartlettroscoe Dec 19, 2022
0d6c68c
Adelus: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
ee3b74e
Amesos: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
f046b63
Amesos2: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
16500d1
Anasazi: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
f6cca4c
AztecOO: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
3dcb92d
Belos: Remove usage of deprecated include_directories() (TriBITSPub/T…
bartlettroscoe Dec 19, 2022
d61e69e
SuiteSparse: Remove usage of deprecated include_directories() (TriBIT…
bartlettroscoe Dec 19, 2022
766ad63
Compadre: Remove usage of deprecated include_directories() (TriBITSPu…
bartlettroscoe Dec 19, 2022
f6d9091
Domi: Remove usage of deprecated include_directories() (TriBITSPub/Tr…
bartlettroscoe Dec 19, 2022
073459e
Epetra: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
cd3921a
EpetraExt: Remove usage of deprecated include_directories() (TriBITSP…
bartlettroscoe Dec 19, 2022
f155dc8
FEI: Remove usage of deprecated include_directories() (TriBITSPub/Tri…
bartlettroscoe Dec 19, 2022
63d7c63
Galeri: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
f12db50
Ifpack: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
872b8a5
Ifpack2: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
f2cd557
Intrepid: Remove usage of deprecated include_directories() (TriBITSPu…
bartlettroscoe Dec 19, 2022
ee8e4fc
Intrepid2: Remove usage of deprecated include_directories() (TriBITSP…
bartlettroscoe Dec 19, 2022
d1f0b3d
Isorropia: Remove usage of deprecated include_directories() (TriBITSP…
bartlettroscoe Dec 19, 2022
fc73a6d
Komplex: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
26f3231
Krino: Remove usage of deprecated include_directories() (TriBITSPub/T…
bartlettroscoe Dec 19, 2022
ed7c3ff
MiniTensor: Remove usage of deprecated include_directories() (TriBITS…
bartlettroscoe Dec 19, 2022
0f403d2
ML: Remove usage of deprecated include_directories() (TriBITSPub/TriB…
bartlettroscoe Dec 19, 2022
f222f3e
Moertel: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
b1b9310
MueLu: Remove usage of deprecated include_directories() (TriBITSPub/T…
bartlettroscoe Dec 19, 2022
f49b2be
NOX: Remove usage of deprecated include_directories() (TriBITSPub/Tri…
bartlettroscoe Dec 19, 2022
2421cce
Pamgen: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
8d25941
Panzer: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
8a4480a
Percept: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
f130989
Phalanx: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
362da71
Pike: Remove usage of deprecated include_directories() (TriBITSPub/Tr…
bartlettroscoe Dec 19, 2022
5fe6344
Piro: Remove usage of deprecated include_directories() (TriBITSPub/Tr…
bartlettroscoe Dec 19, 2022
de68e4f
Pilris: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
471728c
ROL: Remove usage of deprecated include_directories() (TriBITSPub/Tri…
bartlettroscoe Dec 19, 2022
af4482d
Rythmos: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
fd79139
Sacado: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
2c0cc23
SEACAS: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
a4da95b
Shards: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
011d232
ShyLU: Remove usage of deprecated include_directories() (TriBITSPub/T…
bartlettroscoe Dec 19, 2022
6312eb4
STK: Remove usage of deprecated include_directories() (TriBITSPub/Tri…
bartlettroscoe Dec 19, 2022
c42de67
Stokhos: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
afda592
Stratimikos: Remove usage of deprecated include_directories() (TriBIT…
bartlettroscoe Dec 19, 2022
9fb3557
Teko: Remove usage of deprecated include_directories() (TriBITSPub/Tr…
bartlettroscoe Dec 19, 2022
35c80c1
Tempus: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
351aaa0
Teuchos: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
2373bc7
Thyra: Remove usage of deprecated include_directories() (TriBITSPub/T…
bartlettroscoe Dec 19, 2022
b37c50a
Tpetra: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
5195a50
TrilinosCouplings: Remove usage of deprecated include_directories() (…
bartlettroscoe Dec 19, 2022
7bac684
TriUtils: Remove usage of deprecated include_directories() (TriBITSPu…
bartlettroscoe Dec 19, 2022
a641f77
Xpetra: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
5484de2
Zoltan: Remove usage of deprecated include_directories() (TriBITSPub/…
bartlettroscoe Dec 19, 2022
28092f4
Zoltan2: Remove usage of deprecated include_directories() (TriBITSPub…
bartlettroscoe Dec 19, 2022
acca2f9
KokkosKernels: Use KOKKOSKERNELS_INCLUDE_DIRECTORIES() (TriBITSPub/Tr…
bartlettroscoe Dec 20, 2022
aa0e1c5
Set TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE=TRUE (TriBIT…
bartlettroscoe Dec 20, 2022
075e2a7
Automatic snapshot commit from tribits at b0749b08
bartlettroscoe Dec 20, 2022
0615c31
Merge branch 'tribits_github_snapshot' into tribits-snapshot-2022-12-…
bartlettroscoe Dec 20, 2022
99dbebc
Ifpack2: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (…
bartlettroscoe Dec 20, 2022
495eff2
MiniTensor: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs(…
bartlettroscoe Dec 20, 2022
cdf0a03
ML: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriBI…
bartlettroscoe Dec 20, 2022
e4c1a46
MueLu: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (Tr…
bartlettroscoe Dec 20, 2022
d0d5126
Percept: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (…
bartlettroscoe Dec 20, 2022
cdd89bb
Pike: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (Tri…
bartlettroscoe Dec 20, 2022
5b48da2
ROL: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (TriB…
bartlettroscoe Dec 20, 2022
71b920f
RTOp: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (Tri…
bartlettroscoe Dec 20, 2022
d6e6c5d
Rythmos: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (…
bartlettroscoe Dec 20, 2022
434800a
SEACAS: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (T…
bartlettroscoe Dec 20, 2022
b859bfe
Stratimikos: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs…
bartlettroscoe Dec 20, 2022
6130ea6
Tempus: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (T…
bartlettroscoe Dec 20, 2022
2c9c907
Teuchos: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (…
bartlettroscoe Dec 20, 2022
a7b089c
Thyra: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (Tr…
bartlettroscoe Dec 20, 2022
a239283
Tpetra: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (T…
bartlettroscoe Dec 20, 2022
e0ea232
Xpetra: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (T…
bartlettroscoe Dec 20, 2022
eca14d3
Zoltan2: Replace set_and_inc_dirs() with tribits_set_and_inc_dirs() (…
bartlettroscoe Dec 20, 2022
03df3a0
Automatic snapshot commit from tribits at c2f52215
bartlettroscoe Dec 20, 2022
aacf63d
Merge branch 'tribits_github_snapshot' into tribits-snapshot-2022-12-…
bartlettroscoe Dec 20, 2022
bfb7dc8
Merge remote-tracking branch 'github/develop' into tribits-snapshot-2…
bartlettroscoe Dec 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ INCLUDE(${CMAKE_CURRENT_LIST_DIR}/ProjectName.cmake)
# not in an include file :-(
PROJECT(${PROJECT_NAME} NONE)

# Set up to use ccache
if($ENV{CCACHE_NODISABLE})
# ccache must be requested explicitly by setting env-var CCACHE_NODISABLE
find_program(CCACHE_PROGRAM ccache)
Expand Down Expand Up @@ -100,9 +101,12 @@ else()
endif()
endif()

## set an env so we know we are in configure
# Set an env so we know we are in configure
set(ENV{CMAKE_IS_IN_CONFIGURE_MODE} 1)

# Don't define TriBITS override of include_directories()
set(TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE TRUE)

#
# B) Pull in the TriBITS system and execute
#
Expand Down
77 changes: 76 additions & 1 deletion cmake/tribits/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,82 @@
ChangeLog for TriBITS
----------------------------------------

## 2022-12-20:

* **Deprecated:** The macro `set_and_inc_dirs()` is deprecated and replaced by
`tribits_set_and_inc_dirs()`. Use the script
`TriBITS/refactoring/replace_set_and_inc_dirs_r.sh` to update
`CMakeLists.txt` files.

## 2022-11-03:

* **Deprecated:** The long-deprecated TriBITS function override
`include_directories()` now emits a deprecated warning. To replace all
usages of `include_directories()` that should be
`tribits_include_directories()`, use the script
`TriBITS/refactoring/replace_include_directories_r.sh` (see documentation in
that script).

* **Deprecated:** Many previously deprecated TriBITS features now will trigger
a CMake DEPRECATION warning message by default (by calling
`message(DEPRECATION ...)`). The message printed to the CMake output will
typically describe how to remove the usage of the deprecated feature. To
remove deprecation warnings, change to use the non-deprecated features
mentioned in the deprecation warning message. To temporarily disable
deprecation warnings, configure with `-D
TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE=IGNORE` (see build reference entry
for `TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE` for more details).

## 2022-10-20:

* **Changed:** Disabling an external package/TPL will now disable any
downstream external packages/TPLs that list a dependency on that external
package/TPL through its
[`FindTPL<tplName>Dependencies.cmake`](https://tribitspub.github.io/TriBITS/users_guide/index.html#findtpl-tplname-dependencies-cmake)
file. Prior to this, disabling an external package/TPL would not disable
dependent downstream external packages/TPLs (it would only disable
downstream dependent required internal packages). To avoid this, simply
leave the enable status of the upstream external package/TPL empty "" and no
downstream propagation of disables will take place.

## 2022-10-16:

* **Removed:** Removed the variables `<Project>_LIBRARY_DIRS`,
`<Project>_TPL_LIST` and `<Project>_TPL_LIBRARIES` from the installed
`<Project>Config.cmake` file. These are not needed after the change to
modern CMake targets `<Package>::all_libs` (see `<Package>::all_libs`
below). To determine if a TPL is enabled, check `if (TARGET
<tplName>::all_libs)`. To get the libraries and include dirs for a TPL,
link against the IMPORTED target `<tplName>::all_libs` (see the updated
TriBITS example APP projects for details).

* **Removed:** Removed the variables `<Package>_PACKAGE_LIST`,
`<Package>_TPL_LIST`, `<Package>_INCLUDE_DIR`, `<Package>_LIBRARY_DIRS`,
`<Package>_TPL_INCLUDE_DIRS`, `<Package>_TPL_LIBRARIES` and
`<Package>_TPL_LIBRARY_DIRS` from the generated `<Package>Config.cmake`
files. These are not needed with the move to modern CMake targets (see
`<Package>::all_libs` below).

* **Changed:** Changed `<Package>_LIBRARIES` in generated
`<Package>Config.cmake` files from the full list of the package's library
targets to just `<Package>::all_libs`. (There is no need to list the
individual libraries after the move to modern CMake targets.)

## 2022-10-11:

* **Changed:** Added option `<Project>_ASSERT_DEFINED_DEPENDENCIES` to
determine if listed external package/TPL and internal package dependencies
are defined within the project or not. The initial default is `FATAL_ERROR`
for development mode and `IGNORE` for release mode. (Previously, undefined
external package/TPL dependencies where ignore.) To set a different
default, set `<Project>_ASSERT_DEFINED_DEPENDENCIES_DEFAULT` to `WARNING`,
for example, in the project's `ProjectName.cmake` file.

* **Removed:** `<Project>_ASSERT_MISSING_PACKAGES` has been removed and setting
it will result in a `FATAL_ERROR`. Instead, use
`<Project>_ASSERT_DEFINED_DEPENDENCIES` (and make sure all of your project's
listed TPL dependencies are all defined within the project).

## 2022-10-02:

* **Changed:** The TriBITS FindTPLCUDA.cmake module changed
Expand All @@ -11,7 +87,6 @@ ChangeLog for TriBITS
`find_package(CUDAToolkit)` (see [Trilinos
#10954](https://github.com/trilinos/Trilinos/issues/10954)).


## 2022-09-16:

* **Changed:** Changed nomenclature for packages and TPLs (see updated
Expand Down
4 changes: 2 additions & 2 deletions cmake/tribits/ci_support/TribitsDumpDepsXmlScript.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ include(TribitsWriteXmlDependenciesFiles)

# Generate the dependencies file

set(${PROJECT_NAME}_ASSERT_MISSING_PACKAGES FALSE)
set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE)
set(${PROJECT_NAME}_ASSERT_DEFINED_DEPENDENCIES OFF)
set(${PROJECT_NAME}_OUTPUT_DEPENDENCY_FILES FALSE)
if (NOT ${PROJECT_NAME}_PRE_REPOSITORIES) # Make sure is defined!
set(${PROJECT_NAME}_PRE_REPOSITORIES "")
endif()
Expand Down
Loading