Skip to content

Commit

Permalink
Fix copyright notice, clarify version requirement comment
Browse files Browse the repository at this point in the history
Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
  • Loading branch information
kdt3rd committed Jul 20, 2019
1 parent e69dc21 commit bbf1f5e
Show file tree
Hide file tree
Showing 58 changed files with 167 additions and 12 deletions.
5 changes: 4 additions & 1 deletion 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
Expand Down
6 changes: 5 additions & 1 deletion 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
Expand Down
2 changes: 2 additions & 0 deletions 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})
Expand Down
6 changes: 2 additions & 4 deletions 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
Expand Down
3 changes: 3 additions & 0 deletions IlmBase/Iex/CMakeLists.txt
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

ilmbase_define_library(Iex
PRIV_EXPORT IEX_EXPORTS
CURDIR ${CMAKE_CURRENT_SOURCE_DIR}
Expand Down
3 changes: 3 additions & 0 deletions IlmBase/IexMath/CMakeLists.txt
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

ilmbase_define_library(IexMath
PRIV_EXPORT IEXMATH_EXPORTS
CURDIR ${CMAKE_CURRENT_SOURCE_DIR}
Expand Down
3 changes: 3 additions & 0 deletions IlmBase/IexTest/CMakeLists.txt
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(IexTest
main.cpp
testBaseExc.cpp
Expand Down
3 changes: 3 additions & 0 deletions IlmBase/IlmThread/CMakeLists.txt
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

ilmbase_define_library(IlmThread
PRIV_EXPORT ILMTHREAD_EXPORTS
CURDIR ${CMAKE_CURRENT_SOURCE_DIR}
Expand Down
3 changes: 3 additions & 0 deletions 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}
Expand Down
2 changes: 2 additions & 0 deletions 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
Expand Down
2 changes: 2 additions & 0 deletions IlmBase/config/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

include(CheckIncludeFiles)
include(CheckSymbolExists)
Expand Down
5 changes: 5 additions & 0 deletions 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
Expand Down
5 changes: 5 additions & 0 deletions 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
/////////////////////
Expand Down
2 changes: 1 addition & 1 deletion IlmBase/config/IlmBaseConfigInternal.h.in
Expand Up @@ -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

4 changes: 4 additions & 0 deletions 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
Expand Down
2 changes: 2 additions & 0 deletions IlmBase/config/IlmBaseSetup.cmake
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

include(GNUInstallDirs)

Expand Down
3 changes: 3 additions & 0 deletions 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)
Expand Down
2 changes: 2 additions & 0 deletions 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})
Expand Down
6 changes: 5 additions & 1 deletion OpenEXR/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
Expand Down
3 changes: 3 additions & 0 deletions OpenEXR/IlmImf/CMakeLists.txt
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(b44ExpLogTable b44ExpLogTable.cpp)
target_link_libraries(b44ExpLogTable PRIVATE OpenEXR::Config IlmBase::Half IlmBase::IlmThread IlmBase::Iex)
# TODO: Old file had logic to skip these if the file already exists
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/IlmImfExamples/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(IlmImfExamples
drawImage.cpp
Expand Down
3 changes: 3 additions & 0 deletions OpenEXR/IlmImfFuzzTest/CMakeLists.txt
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable( IlmImfFuzzTest
fuzzFile.cpp
main.cpp
Expand Down
3 changes: 3 additions & 0 deletions OpenEXR/IlmImfTest/CMakeLists.txt
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(IlmImfTest
compareB44.cpp
compareDwa.cpp
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/IlmImfUtil/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

openexr_define_library(IlmImfUtil
PRIV_EXPORT ILMIMFUTIL_EXPORTS
Expand Down
3 changes: 3 additions & 0 deletions OpenEXR/IlmImfUtilTest/CMakeLists.txt
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(IlmImfUtilTest
main.cpp
testFlatImage.cpp
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/config/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

include(CheckIncludeFiles)
include(CheckSymbolExists)
Expand Down
3 changes: 3 additions & 0 deletions OpenEXR/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 of specific names / variables
# in it, so be careful copying...
function(OPENEXR_DEFINE_LIBRARY libname)
Expand Down
5 changes: 5 additions & 0 deletions OpenEXR/config/OpenEXRConfig.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_OPENEXR_CONFIG_H
#define INCLUDED_OPENEXR_CONFIG_H 1

#pragma once

//
// Current internal library namepace name
//
Expand Down
5 changes: 5 additions & 0 deletions OpenEXR/config/OpenEXRConfig.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 configure step

#ifndef INCLUDED_OPENEXR_CONFIG_H
#define INCLUDED_OPENEXR_CONFIG_H 1

#pragma once

//
// Current internal library namepace name
//
Expand Down
5 changes: 5 additions & 0 deletions OpenEXR/config/OpenEXRConfigInternal.h.in
@@ -1,3 +1,8 @@
// SPDX-License-Identifier: BSD-3-Clause
// Copyright Contributors to the OpenEXR Project.

#pragma once

//
// SPDX-License-Identifier: BSD-3-Clause
// Copyright Contributors to the OpenEXR Project.
Expand Down
5 changes: 5 additions & 0 deletions OpenEXR/config/OpenEXRConfigInternal.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 configure step

#ifndef INCLUDED_OPENEXR_INTERNAL_CONFIG_H
#define INCLUDED_OPENEXR_INTERNAL_CONFIG_H 1

#pragma once

//
// Define and set to 1 if the target system supports a proc filesystem
// compatible with the Linux kernel's proc filesystem. Note that this
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/config/OpenEXRSetup.cmake
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

include(GNUInstallDirs)

Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/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\\(OpenEXR,[ ]*([0-9]+).([0-9]+).([0-9]+)" DUMMY ${CONFIGURE_AC_CONTENTS})
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/doc/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

install(
FILES
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/exr2aces/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(exr2aces main.cpp)
target_link_libraries(exr2aces OpenEXR::IlmImf)
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/exrenvmap/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable( exrenvmap
makeLatLongMap.cpp
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/exrheader/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(exrheader main.cpp)
target_link_libraries(exrheader OpenEXR::IlmImf)
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/exrmakepreview/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(exrmakepreview
main.cpp
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/exrmaketiled/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(exrmaketiled
makeTiled.cpp
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/exrmultipart/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(exrmultipart exrmultipart.cpp)
target_link_libraries(exrmultipart OpenEXR::IlmImf)
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/exrmultiview/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(exrmultiview
makeMultiView.cpp
Expand Down
2 changes: 2 additions & 0 deletions OpenEXR/exrstdattr/CMakeLists.txt
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

add_executable(exrstdattr main.cpp)
target_link_libraries(exrstdattr OpenEXR::IlmImf)
Expand Down
6 changes: 5 additions & 1 deletion OpenEXR_Viewers/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)

set(OPENEXR_VIEWERS_VERSION 2.3.0)
Expand Down
6 changes: 5 additions & 1 deletion 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
Expand Down
3 changes: 3 additions & 0 deletions PyIlmBase/PyIex/CMakeLists.txt
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

pyilmbase_define_module(iex
LIBNAME PyIex
PRIV_EXPORT PYIEX_BUILD
Expand Down
2 changes: 2 additions & 0 deletions PyIlmBase/PyIexTest/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.PyIexTest_Python2
Expand Down
3 changes: 3 additions & 0 deletions 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
Expand Down
3 changes: 3 additions & 0 deletions 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)
Expand Down
2 changes: 2 additions & 0 deletions 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
Expand Down
3 changes: 3 additions & 0 deletions 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
Expand Down
2 changes: 2 additions & 0 deletions 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
Expand Down

0 comments on commit bbf1f5e

Please sign in to comment.