File luxmark3-luxcore-use-ecm-for-openexr.patch of Package luxrays
diff -urN LuxCore-luxmark_v3.1-test/CMakeLists.txt LuxCore-luxmark_v3.1-test-openexr/CMakeLists.txt
--- LuxCore-luxmark_v3.1-test/CMakeLists.txt 2022-11-09 17:04:50.384267650 +0900
+++ LuxCore-luxmark_v3.1-test-openexr/CMakeLists.txt 2022-11-09 18:53:50.476220622 +0900
@@ -42,7 +42,10 @@
#
################################################################################
+find_package(ECM REQUIRED NO_MODULE)
+
set(CMAKE_MODULE_PATH
+ ${ECM_MODULE_PATH}
"${LuxRays_SOURCE_DIR}"
"${LuxRays_SOURCE_DIR}/cmake"
"${LuxRays_SOURCE_DIR}/cmake/Utils"
diff -urN LuxMark-luxmark_v3.1-patched/cmake/Dependencies.cmake LuxMark-luxmark_v3.1-patched-exr/cmake/Dependencies.cmake
--- LuxMark-luxmark_v3.1-patched/cmake/Dependencies.cmake 2022-11-10 09:24:02.470446605 +0900
+++ LuxMark-luxmark_v3.1-patched-exr/cmake/Dependencies.cmake 2022-11-10 09:30:12.843866469 +0900
@@ -36,7 +36,7 @@
if(NOT APPLE)
# Apple has these available hardcoded and matched in macos repo, see Config_OSX.cmake
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS})
+ include_directories(SYSTEM ${PC_OpenEXR_INCLUDEDIR}) # OpenEXR_INCLUDE_DIRS
find_package(TIFF REQUIRED)
include_directories(SYSTEM ${TIFF_INCLUDE_DIR})
find_package(JPEG REQUIRED)
diff -urN LuxCore-luxmark_v3.1-test/cmake/Packages/FindOpenEXR.cmake LuxCore-luxmark_v3.1-test-openexr/cmake/Packages/FindOpenEXR.cmake
--- LuxCore-luxmark_v3.1-test/cmake/Packages/FindOpenEXR.cmake 2015-08-30 06:34:01.000000000 +0900
+++ LuxCore-luxmark_v3.1-test-openexr/cmake/Packages/FindOpenEXR.cmake 1970-01-01 09:00:00.000000000 +0900
@@ -1,126 +0,0 @@
-###########################################################################
-# Copyright (C) 1998-2013 by authors (see AUTHORS.txt) #
-# #
-# This file is part of Lux. #
-# #
-# Lux is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# Lux is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-# Lux website: http://www.luxrender.net #
-###########################################################################
-
-# - Try to find OpenEXR
-# Library is first searched for in OPENEXR_ROOT
-# Once done, this will define
-#
-# OPENEXR_FOUND - system has OpenEXR
-# OPENEXR_INCLUDE_DIRS - the OpenEXR include directories
-# OPENEXR_LIBRARIES - link these to use OpenEXR
-
-# Lookup user specified path first
-SET(OpenEXR_TEST_HEADERS ImfXdr.h OpenEXRConfig.h IlmBaseConfig.h)
-SET(OpenEXR_INC_SUFFIXES include/OpenEXR include Include Headers)
-FIND_PATH(OPENEXR_INCLUDE_DIRS
- NAMES ${OpenEXR_TEST_HEADERS}
- PATHS "${OPENEXR_ROOT}"
- PATH_SUFFIXES ${OpenEXR_INC_SUFFIXES}
- NO_DEFAULT_PATH
- DOC "The directory where IlmBaseConfig.h resides"
-)
-FIND_PATH(OPENEXR_INCLUDE_DIRS
- NAMES ${OpenEXR_TEST_HEADERS}
- PATHS /usr/local /usr /sw /opt/local /opt/csw /opt
- PATH_SUFFIXES ${OpenEXR_INC_SUFFIXES}
- DOC "The directory where IlmBaseConfig.h resides"
-)
-
-IF (OPENEXR_INCLUDE_DIRS)
-# Lookup additional headers in case they are in subdirectories
-SET(OpenEXR_MODULES Iex Imf half Imath IlmThread)
-FOREACH(i ${OpenEXR_MODULES})
- FIND_PATH(OpenEXR_${i}_INCLUDE_DIR
- NAMES ${i}.h ${i}Header.h ${i}Math.h
- PATHS "${OPENEXR_INCLUDE_DIRS}" "${OPENEXR_INCLUDE_DIRS}/${i}" "${OPENEXR_INCLUDE_DIRS}/Ilm${i}"
- NO_DEFAULT_PATH
- DOC "The directory where ${i}.h resides"
- )
-ENDFOREACH(i)
-FOREACH(i ${OpenEXR_MODULES})
- IF (NOT OpenEXR_${i}_INCLUDE_DIR)
- SET(OpenEXR_${i}_INCLUDE_DIR)
- ENDIF (NOT OpenEXR_${i}_INCLUDE_DIR)
- IF ("${OpenEXR_${i}_INCLUDE_DIR}" STREQUAL "${OPENEXR_INCLUDE_DIRS}")
- SET(OpenEXR_${i}_INCLUDE_DIR "")
- ENDIF ("${OpenEXR_${i}_INCLUDE_DIR}" STREQUAL "${OPENEXR_INCLUDE_DIRS}")
-ENDFOREACH(i)
-FOREACH(i ${OpenEXR_MODULES})
- SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIRS} ${OpenEXR_${i}_INCLUDE_DIR})
-ENDFOREACH(i)
-ENDIF(OPENEXR_INCLUDE_DIRS)
-
-SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread)
-SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs)
-SET(OpenEXR_LIB_SUFFIXES_REL)
-SET(OpenEXR_LIB_SUFFIXES_DBG)
-FOREACH(i ${OpenEXR_LIB_SUFFIXES})
- SET(OpenEXR_LIB_SUFFIXES_REL ${OpenEXR_LIB_SUFFIXES_REL}
- "${i}" "${i}/release" "${i}/relwithdebinfo" "${i}/minsizerel" "${i}/dist")
- SET(OpenEXR_LIB_SUFFIXES_DBG ${OpenEXR_LIB_SUFFIXES_DBG}
- "${i}" "${i}/debug" "${i}/dist")
-ENDFOREACH(i)
-SET(OPENEXR_LIBRARIES)
-FOREACH(i ${OpenEXR_LIBRARY_MODULES})
- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_REL
- NAMES ${i}
- PATHS "${OPENEXR_ROOT}"
- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_REL}
- NO_DEFAULT_PATH
- DOC "The ${i} release library"
- )
- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_REL
- NAMES ${i}
- PATHS /usr/local /usr /sw /opt/local /opt/csw /opt
- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_REL}
- DOC "The ${i} release library"
- )
- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_DBG
- NAMES "${i}d" "${i}D" "${i}_d" "${i}_D" "${i}_debug"
- PATHS "${OPENEXR_ROOT}"
- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_DBG}
- NO_DEFAULT_PATH
- DOC "The ${i} debug library"
- )
- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_DBG
- NAMES "${i}d" "${i}D" "${i}_d" "${i}_D" "${i}_debug"
- PATHS /usr/local /usr /sw /opt/local /opt/csw /opt
- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_DBG}
- DOC "The ${i} debug library"
- )
- IF (OpenEXR_${i}_LIBRARY_REL AND OpenEXR_${i}_LIBRARY_DBG)
- SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}
- optimized ${OpenEXR_${i}_LIBRARY_REL}
- debug ${OpenEXR_${i}_LIBRARY_DBG})
- ELSEIF (OpenEXR_${i}_LIBRARY_REL)
- SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}
- ${OpenEXR_${i}_LIBRARY_REL})
- ELSEIF (OpenEXR_${i}_LIBRARY_DBG)
- SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}
- ${OpenEXR_${i}_LIBRARY_DBG})
- ENDIF (OpenEXR_${i}_LIBRARY_REL AND OpenEXR_${i}_LIBRARY_DBG)
-ENDFOREACH (i)
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENEXR DEFAULT_MSG OPENEXR_LIBRARIES OPENEXR_INCLUDE_DIRS)
-
-MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIRS OPENEXR_LIBRARIES)
-
diff -urN LuxCore-luxmark_v3.1-test/samples/luxcoredemo/CMakeLists.txt LuxCore-luxmark_v3.1-test-openexr/samples/luxcoredemo/CMakeLists.txt
--- LuxCore-luxmark_v3.1-test/samples/luxcoredemo/CMakeLists.txt 2015-08-30 06:34:01.000000000 +0900
+++ LuxCore-luxmark_v3.1-test-openexr/samples/luxcoredemo/CMakeLists.txt 2022-11-09 17:52:04.336979274 +0900
@@ -29,4 +29,4 @@
add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS})
add_definitions(${VISIBILITY_FLAGS})
-TARGET_LINK_LIBRARIES(luxcoredemo luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+TARGET_LINK_LIBRARIES(luxcoredemo luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${TIFF_LIBRARIES} ${OpenEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
diff -urN LuxCore-luxmark_v3.1-test/samples/luxcoreimplserializationdemo/CMakeLists.txt LuxCore-luxmark_v3.1-test-openexr/samples/luxcoreimplserializationdemo/CMakeLists.txt
--- LuxCore-luxmark_v3.1-test/samples/luxcoreimplserializationdemo/CMakeLists.txt 2015-08-30 06:34:01.000000000 +0900
+++ LuxCore-luxmark_v3.1-test-openexr/samples/luxcoreimplserializationdemo/CMakeLists.txt 2022-11-09 17:52:34.939562037 +0900
@@ -28,4 +28,4 @@
add_executable(luxcoreimplserializationdemo ${LUXCOREIMPL_SERIALIZATIONDEMO_SRCS})
-TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${TIFF_LIBRARIES} ${OpenEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
diff -urN LuxCore-luxmark_v3.1-test/samples/luxcorescenedemo/CMakeLists.txt LuxCore-luxmark_v3.1-test-openexr/samples/luxcorescenedemo/CMakeLists.txt
--- LuxCore-luxmark_v3.1-test/samples/luxcorescenedemo/CMakeLists.txt 2015-08-30 06:34:01.000000000 +0900
+++ LuxCore-luxmark_v3.1-test-openexr/samples/luxcorescenedemo/CMakeLists.txt 2022-11-09 17:53:14.555265039 +0900
@@ -29,4 +29,4 @@
add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS})
add_definitions(${VISIBILITY_FLAGS})
-TARGET_LINK_LIBRARIES(luxcorescenedemo luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+TARGET_LINK_LIBRARIES(luxcorescenedemo luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${TIFF_LIBRARIES} ${OpenEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
diff -urN LuxCore-luxmark_v3.1-test/samples/smallluxgpu4/CMakeLists.txt LuxCore-luxmark_v3.1-test-openexr/samples/smallluxgpu4/CMakeLists.txt
--- LuxCore-luxmark_v3.1-test/samples/smallluxgpu4/CMakeLists.txt 2022-11-09 17:04:50.380934361 +0900
+++ LuxCore-luxmark_v3.1-test-openexr/samples/smallluxgpu4/CMakeLists.txt 2022-11-09 17:53:43.594564287 +0900
@@ -30,9 +30,9 @@
add_executable(slg4 ${SMALLLUXGPU_SRCS})
if(APPLE)
- TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${OPENGL_LIBRARIES} ${OpenCL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+ TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${OPENGL_LIBRARIES} ${OpenCL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OpenEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
else(APPLE)
- TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${OPENGL_LIBRARIES} ${OpenCL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+ TARGET_LINK_LIBRARIES(slg4 luxcore smallluxgpu luxrays ${EMBREE_LIBRARY} ${OPENGL_LIBRARIES} ${OpenCL_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${TIFF_LIBRARIES} ${OpenEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
endif(APPLE)
# This instructs FREEGLUT to emit a pragma for the static version
