Skip to content
Permalink
Browse files

Merge branch 'copyright' into develop

  • Loading branch information...
jbakosi committed Apr 8, 2019
2 parents 97a538b + 8c3def3 commit 3db5382796905b259ea3823b4cd0521b31c54587
Showing with 21 additions and 9 deletions.
  1. +5 −2 cmake/charm.cmake
  2. +5 −2 cmake/get_compiler_flags.cmake
  3. +5 −2 cmake/libstdcxx.cmake
  4. +5 −2 cmake/test_runner.cmake
  5. +1 −1 external
@@ -1,7 +1,10 @@
################################################################################
#
# \file cmake/charm.cmake
# \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC.
# \file charm.cmake
# \copyright 2012-2015 J. Bakosi,
# 2016-2018 Los Alamos National Security, LLC.,
# 2019 Triad National Security, LLC.
# All rights reserved. See the LICENSE file for details.
# \brief Function used to setup a Charm++ module
#
################################################################################
@@ -1,7 +1,10 @@
################################################################################
#
# \file cmake/get_compiler_flags.cmake
# \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC.
# \file get_compiler_flags.cmake
# \copyright 2012-2015 J. Bakosi,
# 2016-2018 Los Alamos National Security, LLC.,
# 2019 Triad National Security, LLC.
# All rights reserved. See the LICENSE file for details.
# \brief Cmake code to get compiler flags
#
################################################################################
@@ -1,7 +1,10 @@
################################################################################
#
# \file cmake/libstdcxx.cmake
# \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC.
# \file libstdcxx.cmake
# \copyright 2012-2015 J. Bakosi,
# 2016-2018 Los Alamos National Security, LLC.,
# 2019 Triad National Security, LLC.
# All rights reserved. See the LICENSE file for details.
# \brief Find libc++ and offer to switch between libc++ and libstdc++
#
################################################################################
@@ -1,7 +1,10 @@
################################################################################
#
# \file cmake/test_runner.cmake
# \copyright 2012-2015, J. Bakosi, 2016-2018, Los Alamos National Security, LLC.
# \file test_runner.cmake
# \copyright 2012-2015 J. Bakosi,
# 2016-2018 Los Alamos National Security, LLC.,
# 2019 Triad National Security, LLC.
# All rights reserved. See the LICENSE file for details.
# \brief Regression test runner using the cmake scripting language
#
################################################################################
Submodule external updated 1 files
+1 −1 cmake

0 comments on commit 3db5382

Please sign in to comment.
You can’t perform that action at this time.