Merge pull request #333 from LLNL/feature/white238/bumpversion

Release v0.3.0 Step 1

.travis.yml

@@ -112,8 +112,8 @@ addons:
        - gcc-4.9
        - g++-4.9
        - gfortran-4.9
-       - mpich2
-       - libmpich2-dev
+       - mpich
+       - libmpich-dev
 before_install:
   # workaround apt related for error:
   # Err:6 http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty InRelease
@@ -160,6 +160,7 @@ script:
   # c & c++ compilers
   - CMAKE_OPTS="${CMAKE_OPTS} -DCMAKE_C_COMPILER=${BLT_CC}"
   - CMAKE_OPTS="${CMAKE_OPTS} -DCMAKE_CXX_COMPILER=${BLT_CXX}"
+  - CMAKE_OPTS="${CMAKE_OPTS} -DBLT_CXX_STD:STRING=c++11"
   # gtest support
   - CMAKE_OPTS="${CMAKE_OPTS} -DENABLE_GTEST=${BLT_GTEST}"
   # gmock support

LICENSE

@@ -1,69 +1,27 @@
 Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC.
-
-Produced at the Lawrence Livermore National Laboratory
-
-Developers include:
-
-Chris White ([email protected])
-Cyrus Harrison ([email protected])
-George Zagaris ([email protected])
-Kenneth Weiss ([email protected])
-Lee Taylor ([email protected])
-Aaron Black ([email protected])
-David A. Beckingsale ([email protected])
-Richard Hornung ([email protected])
-Randolph Settgast ([email protected])
-Peter Robinson ([email protected])
-
-LLNL-CODE-725085.
-
 All rights reserved.
 
-This file is part of BLT. For details, see https://github.com/LLNL/blt.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-• Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the disclaimer below.
-
-• Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the disclaimer (as noted below) in the
-  documentation and/or other materials provided with the distribution.
-
-• Neither the name of the LLNS/LLNL nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY, LLC, THE
-U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional BSD Notice
-
-1. This notice is required to be provided under our contract with the U.S.
-Department of Energy (DOE). This work was produced at Lawrence Livermore
-National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
-
-2. Neither the United States Government nor Lawrence Livermore National
-Security, LLC nor any of their employees, makes any warranty, express or
-implied, or assumes any liability or responsibility for the accuracy,
-completeness, or usefulness of any information, apparatus, product, or process
-disclosed, or represents that its use would not infringe privately-owned rights.
-
-3. Also, reference herein to any specific commercial products, process, or
-services by trade name, trademark, manufacturer or otherwise does not
-necessarily constitute or imply its endorsement, recommendation, or favoring by
-the United States Government or Lawrence Livermore National Security, LLC. The
-views and opinions of authors expressed herein do not necessarily state or
-reflect those of the United States Government or Lawrence Livermore National
-Security, LLC, and shall not be used for advertising or product endorsement
-purposes.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

NOTICE

@@ -0,0 +1,20 @@
+Additional BSD Notice
+
+1. This notice is required to be provided under our contract with the U.S.
+Department of Energy (DOE). This work was produced at Lawrence Livermore
+National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
+
+2. Neither the United States Government nor Lawrence Livermore National
+Security, LLC nor any of their employees, makes any warranty, express or
+implied, or assumes any liability or responsibility for the accuracy,
+completeness, or usefulness of any information, apparatus, product, or process
+disclosed, or represents that its use would not infringe privately-owned rights.
+
+3. Also, reference herein to any specific commercial products, process, or
+services by trade name, trademark, manufacturer or otherwise does not
+necessarily constitute or imply its endorsement, recommendation, or favoring by
+the United States Government or Lawrence Livermore National Security, LLC. The
+views and opinions of authors expressed herein do not necessarily state or
+reflect those of the United States Government or Lawrence Livermore National
+Security, LLC, and shall not be used for advertising or product endorsement
+purposes.

README.md

@@ -1,8 +1,8 @@
-# <img src="/share/blt/logo/blt_logo.png?raw=true" width="128" valign="middle" alt="BLT"/> v0.2
+# <img src="/share/blt/logo/blt_logo.png?raw=true" width="128" valign="middle" alt="BLT"/>
 
 [![Build Status](https://travis-ci.org/LLNL/blt.svg)](https://travis-ci.org/LLNL/blt)
 [![Build Status](https://ci.appveyor.com/api/projects/status/fuaftu9mvp0y488j/branch/master?svg=true)](https://ci.appveyor.com/project/cyrush/blt/branch/master)
-[![Documentation Status](https://readthedocs.org/projects/llnl-blt/badge/?version=latest)](https://llnl-blt.readthedocs.io/en/latest/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/llnl-blt/badge/?version=develop)](https://llnl-blt.readthedocs.io/en/develop/?badge=develop)
 
 BLT is a streamlined [CMake](https://cmake.org)-based foundation for 
 <b>B</b>uilding, <b>L</b>inking and <b>T</b>esting large-scale high performance computing (HPC) applications.
@@ -71,8 +71,8 @@ Developers include:
 
 Please see the [BLT Contributors Page](https://github.com/LLNL/BLT/graphs/contributors) for the full list of project contributors.
 
-Projects using this library
----------------------------
+Open-Source Projects using BLT
+------------------------------
 
  * [Ascent](https://github.com/Alpine-DAV/ascent): A flyweight in-situ visualization and analysis runtime for multi-physics HPC simulations
  * [Axom](https://github.com/LLNL/axom): Software infrastructure for the development of multi-physics applications and computational tools
@@ -85,19 +85,50 @@ Projects using this library
 If you would like to add a library to this list, please let us know via [email](mailto:[email protected])
 or by submitting an [issue](https://github.com/LLNL/blt/issues) or [pull-request](https://github.com/LLNL/blt/pulls).
 
-Release
+License
 -------
 
-Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC.
+BLT is licensed under the BSD 3-Clause license,
+(BSD-3-Clause or https://opensource.org/licenses/BSD-3-Clause).
 
-Produced at the Lawrence Livermore National Laboratory.
-
-All rights reserved.
+Copyrights and patents in the BLT project are retained by contributors.
+No copyright assignment is required to contribute to BLT.
 
+See [LICENSE](./LICENSE) for details.
+
 Unlimited Open Source - BSD 3-clause Distribution
 `LLNL-CODE-725085`  `OCEC-17-023`
 
-Additional license and copyright information can be found in the following files:
- * [LICENSE](./LICENSE)
- * [COPYRIGHT](./COPYRIGHT) 
-
+SPDX usage
+------------
+
+Individual files contain SPDX tags instead of the full license text.
+This enables machine processing of license information based on the SPDX
+License Identifiers that are available here: https://spdx.org/licenses/
+
+Files that are licensed as BSD 3-Clause contain the following
+text in the license header:
+
+    SPDX-License-Identifier: (BSD-3-Clause)
+
+External Packages
+-------------------
+BLT bundles its external dependencies in thirdparty_builtin/.  These
+packages are covered by various permissive licenses.  A summary listing
+follows.  See the license included with each package for full details.
+
+PackageName: fruit  
+PackageHomePage: https://sourceforge.net/projects/fortranxunit/  
+PackageLicenseDeclared: BSD-3-Clause  
+
+PackageName: gbenchmark  
+PackageHomePage: https://github.com/google/benchmark  
+PackageLicenseDeclared: Apache-2.0  
+
+PackageName: gmock  
+PackageHomePage: https://github.com/google/googlemock  
+PackageLicenseDeclared: BSD-3-Clause  
+
+PackageName: gtest  
+PackageHomePage: https://github.com/google/googletest  
+PackageLicenseDeclared: BSD-3-Clause  

RELEASE-NOTES.md

@@ -7,10 +7,40 @@ The format of this file is based on [Keep a Changelog](http://keepachangelog.com
 
 The project release numbers follow [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased] - Release date yyyy-mm-dd
+
+## [Version 0.3.0] - Release date 2020-01-08
+
+### Added
+- Sets CMake policy CMP0074 to NEW, when available.
+- Added simpler Clang+XLF+Cuda host-config for LLNL's blueos
+- API Docs that are public!
+- Added the ability to override blt's custom target names, e.g. for code checks,
+  formatting and generating documentation. The new variables are: ``BLT_CODE_CHECK_TARGET_NAME``,
+  ``BLT_CODE_STYLE_TARGET_NAME``, ``BLT_DOCS_TARGET_NAME`` and  ``BLT_RUN_BENCHMARKS_TARGET_NAME``.
+- Clean up linking flags when ``CUDA_LINK_WITH_NVCC`` is ON. Added logic to automatically convert
+  '-Wl,-rpath' linking flag to '-Xlinker -rpath -Xlinker' and removes ``-pthread`` from from
+  MPI linking flags returned from FindMPI because it doesn't work
+  (see https://gitlab.kitware.com/cmake/cmake/issues/18008).
+- In CMake 3.13+, "SHELL:" was added to blt_add_target_link_flags.  This stops CMake from de-duplicating
+  needed linker flags.
+- Added optional SCOPE to all target property macros, blt_add_target_link_flags, etc.  It defaults to PUBLIC.
+- Added support for Cray compilers in blt_append_custom_compiler_flag.
+- Added ability to add flags to the cppcheck command line through blt_add_code_checks()
+- Added ability for blt_add_test() to set required number of OpenMP threads via new option NUM_OMP_THREADS.
+
+### Changed
+- Restructured the host-config directory by site and platform.
+- Updated gbenchmark to 1.5.0, note that this requires C++11 to build.
+- Updated gtest and gmock to Master as of 2020-01-07, note that this requires C++11 to build.
+
+### Fixed
+- Fixed some warnings in CMake 3.14+
+
 ## [Version 0.2.5] - Release date 2019-06-13
 
 ### Added
-- Added support for C++17. Note: Neither XL or CMake's CUDA_STANDARD does not support
+- Added support for C++17. Note: Neither XL nor CMake's CUDA_STANDARD supports
   C++17 (A BLT fatal error will occur).
 - Added ability to override all MPI variables: BLT_MPI_COMPILE_FLAGS,
   BLT_MPI_INCLUDES, BLT_MPI_LIBRARIES, and BLT_MPI_LINK_FLAGS
@@ -70,5 +100,8 @@ The project release numbers follow [Semantic Versioning](http://semver.org/spec/
 ### Known Bugs
 
 
+
+[Unreleased]:    https://github.com/LLNL/blt/compare/v0.3.0...develop
+[Version 0.3.0]: https://github.com/LLNL/blt/compare/v0.2.5...v0.3.0
 [Version 0.2.5]: https://github.com/LLNL/blt/compare/v0.2.0...v0.2.5
 [Version 0.2.0]: https://github.com/LLNL/blt/compare/v0.1.0...v0.2.0

SetupBLT.cmake

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 
 if (NOT BLT_LOADED)
-    set(BLT_VERSION "0.2.5" CACHE STRING "")
+    set(BLT_VERSION "0.3.0" CACHE STRING "")
     mark_as_advanced(BLT_VERSION)
     message(STATUS "BLT Version: ${BLT_VERSION}")
 
@@ -59,6 +59,12 @@ if (NOT BLT_LOADED)
         cmake_policy(SET CMP0057 NEW)
     endif()
 
+    # Policy to use <PackageName>_ROOT variable in find_<Package> commands
+    # Policy added in 3.12+
+    if(POLICY CMP0074)
+        cmake_policy(SET CMP0074 NEW)
+    endif()
+
     # New turns relative target_sources() paths to absolute
     # Policy added in 3.13+
     # NOTE: this will be deprecated eventually but NEW causes
@@ -167,9 +173,9 @@ if (NOT BLT_LOADED)
     #
     ################################
     set(BLT_C_FILE_EXTS ".cpp" ".hpp" ".cxx" ".hxx" ".c" ".h" ".cc" ".hh" ".inl" ".cu"
-               CACHE LIST "List of known file extensions used for C/CXX sources")
+               CACHE STRING "List of known file extensions used for C/CXX sources")
     set(BLT_Fortran_FILE_EXTS ".F" ".f" ".f90" ".F90"
-               CACHE LIST "List of known file extensions used for Fortran sources")
+               CACHE STRING "List of known file extensions used for Fortran sources")
 
 
     ################################

appveyor.yml

@@ -77,6 +77,7 @@ build_script:
       -D ENABLE_GMOCK=%ENABLE_GMOCK% ^
       -D ENABLE_BENCHMARKS=%ENABLE_BENCHMARKS% ^
       -D ENABLE_OPENMP=ON ^
+      -D BLT_CXX_STD:STRING=c++11 ^
       -D ENABLE_MPI=%ENABLE_MPI% ^
       -D MPI_C_INCLUDE_PATH:PATH="%MPI_HOME%/Include" ^
       -D MPI_C_LIBRARIES:PATH="%MPI_HOME%/Lib/x86/msmpi.lib" ^