Fix copyright notice, clarify version requirement comment

Signed-off-by: Kimball Thurston <[email protected]>
AcademySoftwareFoundation · Jul 20, 2019 · a8c344f · a8c344f
1 parent 0c0b228
commit a8c344f
Show file tree

Hide file tree

Showing 27 changed files with 77 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,8 @@
-# "More Modern" CMake version
+# We require this to get object library link library support and
+# combined python 2 + 3 support
 
+# We require this to get object library link library support and
+# combined python 2 + 3 support
 cmake_minimum_required(VERSION 3.12)
 
 # Hint: This can be set to enable custom find_package

diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
@@ -1,4 +1,8 @@
-# "More Modern" CMake version
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
+# We require this to get object library link library support and
+# combined python 2 + 3 support
 cmake_minimum_required(VERSION 3.12)
 
 # we include this first to parse configure.ac and extract the version

diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 add_executable(eLut eLut.cpp)
 target_compile_features(eLut PUBLIC cxx_std_${OPENEXR_CXX_STANDARD})

diff --git a/IlmBase/HalfTest/CMakeLists.txt b/IlmBase/HalfTest/CMakeLists.txt
@@ -1,7 +1,5 @@
-##
-## SPDX-License-Identifier: BSD-3-Clause
-## Copyright Contributors to the OpenEXR Project.
-##
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 add_executable(HalfTest
   main.cpp

diff --git a/IlmBase/Imath/CMakeLists.txt b/IlmBase/Imath/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
 ilmbase_define_library(Imath
   PRIV_EXPORT IMATH_EXPORTS
   CURDIR ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/IlmBase/ImathTest/CMakeLists.txt b/IlmBase/ImathTest/CMakeLists.txt
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 add_executable(ImathTest 
   main.cpp

diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 include(CheckIncludeFiles)
 include(CheckSymbolExists)

diff --git a/IlmBase/config/IlmBaseConfig.h.in b/IlmBase/config/IlmBaseConfig.h.in
@@ -1,8 +1,13 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright Contributors to the OpenEXR Project.
+
 // This file is auto-generated by the configure step
 
 #ifndef INCLUDED_ILMBASE_CONFIG_H
 #define INCLUDED_ILMBASE_CONFIG_H 1
 
+#pragma once
+
 //
 // Define and set to 1 if the target system has c++11/14 support
 // and you want IlmBase to NOT use it's features

diff --git a/IlmBase/config/IlmBaseConfig.h.in_cmake b/IlmBase/config/IlmBaseConfig.h.in_cmake
@@ -1,8 +1,13 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright Contributors to the OpenEXR Project.
+
 // This file is auto-generated by the cmake configure step
 
 #ifndef INCLUDED_ILMBASE_CONFIG_H
 #define INCLUDED_ILMBASE_CONFIG_H 1
 
+#pragma once
+
 //
 // Options / configuration based on O.S. / compiler
 /////////////////////

diff --git a/IlmBase/config/IlmBaseConfigInternal.h.in b/IlmBase/config/IlmBaseConfigInternal.h.in
@@ -3,11 +3,11 @@
 // Copyright Contributors to the OpenEXR Project.
 //
 
+#pragma once
 
 //
 // Dealing with FPEs
 //
 #undef HAVE_UCONTEXT_H
 
 #undef ILMBASE_HAVE_CONTROL_REGISTER_SUPPORT
-
diff --git a/IlmBase/config/IlmBaseConfigInternal.h.in_cmake b/IlmBase/config/IlmBaseConfigInternal.h.in_cmake
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright Contributors to the OpenEXR Project.
+
+#pragma once
 
 //
 // Dealing with FPEs

diff --git a/IlmBase/config/IlmBaseSetup.cmake b/IlmBase/config/IlmBaseSetup.cmake
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 include(GNUInstallDirs)
 

diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
 # NB: This function has a number if IlmBase specific names / variables
 # in it, so be careful copying...
 function(ILMBASE_DEFINE_LIBRARY libname)

diff --git a/IlmBase/config/ParseConfigure.cmake b/IlmBase/config/ParseConfigure.cmake
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 file(READ configure.ac CONFIGURE_AC_CONTENTS)
 string(REGEX MATCH "AC_INIT\\(IlmBase,[ ]*([0-9]+).([0-9]+).([0-9]+)" DUMMY ${CONFIGURE_AC_CONTENTS})

diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt
@@ -1,4 +1,8 @@
-# "More Modern" CMake version
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
+# We require this to get object library link library support and
+# combined python 2 + 3 support
 cmake_minimum_required(VERSION 3.12)
 
 # we include this first to parse configure.ac and extract the version

diff --git a/PyIlmBase/PyImath/CMakeLists.txt b/PyIlmBase/PyImath/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
 pyilmbase_define_module(imath
   LIBNAME PyImath
   PRIV_EXPORT PYIMATH_BUILD

diff --git a/PyIlmBase/PyImathNumpy/CMakeLists.txt b/PyIlmBase/PyImathNumpy/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
 if(TARGET Python2::Python AND
    TARGET Boost::${PYILMBASE_BOOST_PY2_COMPONENT} AND
    TARGET Python2::IlmBaseNumPy)

diff --git a/PyIlmBase/PyImathNumpyTest/CMakeLists.txt b/PyIlmBase/PyImathNumpyTest/CMakeLists.txt
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 if(TARGET Python2::Interpreter)
   add_test(PyIlmBase.PyImathNumpyTest_Python2

diff --git a/PyIlmBase/PyImathTest/CMakeLists.txt b/PyIlmBase/PyImathTest/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
 if(TARGET Python2::Interpreter)
   add_test(PyIlmBase.PyImathTest_Python2
     ${Python2_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/pyImathTest.in

diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 ### The autoconf setup for this folder generates a PyIlmBaseConfig.h file
 ### but no source actually uses that, so let's elide that for now

diff --git a/PyIlmBase/config/ModuleDefine.cmake b/PyIlmBase/config/ModuleDefine.cmake
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 function(PYILMBASE_ADD_LIBRARY_PRIV libname)
   set(options)

diff --git a/PyIlmBase/config/NumPyLocate.cmake b/PyIlmBase/config/NumPyLocate.cmake
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 if(TARGET Python2::Interpreter)
   execute_process(

diff --git a/PyIlmBase/config/ParseConfigure.cmake b/PyIlmBase/config/ParseConfigure.cmake
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 file(READ configure.ac CONFIGURE_AC_CONTENTS)
 string(REGEX MATCH "AC_INIT\\(PyIlmBase,[ ]*([0-9]+).([0-9]+).([0-9]+)" DUMMY ${CONFIGURE_AC_CONTENTS})

diff --git a/PyIlmBase/config/PyIlmBaseSetup.cmake b/PyIlmBase/config/PyIlmBaseSetup.cmake
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
 
 include(GNUInstallDirs)
 

diff --git a/cmake/SampleCTestScript.cmake b/cmake/SampleCTestScript.cmake
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
 # This is a sample cmake test script that can be used to integrate into
 # a larger CI setup if you are building your own versions of OpenEXR
 # and also use a cdash (or cdash compliant) results server.

diff --git a/cmake/Toolchain-Linux-VFX_Platform15.cmake b/cmake/Toolchain-Linux-VFX_Platform15.cmake
@@ -1,4 +1,6 @@
-#
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
 # This is only an example of a theoretical toolchain file
 # that might be used for compiling to target a VFX
 # reference platform (https://vfxplatform.com) that is

diff --git a/cmake/Toolchain-mingw.cmake b/cmake/Toolchain-mingw.cmake
@@ -1,4 +1,6 @@
-#
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright Contributors to the OpenEXR Project.
+
 # This is only an example of cross compiling, but to compile for windows
 # under linux, have the relevant bits installed, and
 # validate the find path below