BRL-CAD/appleseed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaks for building with latest bext versions of deps

Browse Source
This commit is contained in:
Clifford Yapp
2024-06-26 16:40:56 -04:00
parent a19d542c45
commit 05e66fd424
2 changed files with 116 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/FindEigen3.cmake
+107
View File
@@ -0,0 +1,107 @@
# - Try to find Eigen3 lib
#
# This module supports requiring a minimum version, e.g. you can do
# find_package(Eigen3 3.1.2)
# to require version 3.1.2 or newer of Eigen3.
#
# Once done this will define
#
# EIGEN3_FOUND - system has eigen lib with correct version
# EIGEN3_INCLUDE_DIR - the eigen include directory
# EIGEN3_VERSION - eigen version
#
# and the following imported target:
#
# Eigen3::Eigen - The header-only Eigen library
#
# This module reads hints about search locations from
# the following environment variables:
#
# EIGEN3_ROOT
# EIGEN3_ROOT_DIR
# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
if(NOT Eigen3_FIND_VERSION)
if(NOT Eigen3_FIND_VERSION_MAJOR)
set(Eigen3_FIND_VERSION_MAJOR 2)
endif()
if(NOT Eigen3_FIND_VERSION_MINOR)
set(Eigen3_FIND_VERSION_MINOR 91)
endif()
if(NOT Eigen3_FIND_VERSION_PATCH)
set(Eigen3_FIND_VERSION_PATCH 0)
endif()
set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
endif()
macro(_eigen3_check_version)
file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}")
set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
set(EIGEN3_VERSION_OK FALSE)
else()
set(EIGEN3_VERSION_OK TRUE)
endif()
if(NOT EIGEN3_VERSION_OK)
message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
"but at least version ${Eigen3_FIND_VERSION} is required")
endif()
endmacro()
if (EIGEN3_INCLUDE_DIR)
# in cache already
_eigen3_check_version()
set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
set(Eigen3_FOUND ${EIGEN3_VERSION_OK})
else ()
# search first if an Eigen3Config.cmake is available in the system,
# if successful this would set EIGEN3_INCLUDE_DIR and the rest of
# the script will work as usual
find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET)
if(NOT EIGEN3_INCLUDE_DIR)
find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
HINTS
ENV EIGEN3_ROOT
ENV EIGEN3_ROOT_DIR
PATHS
${CMAKE_INSTALL_PREFIX}/include
${KDE4_INCLUDE_DIR}
PATH_SUFFIXES eigen3 eigen
)
endif()
if(EIGEN3_INCLUDE_DIR)
_eigen3_check_version()
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
mark_as_advanced(EIGEN3_INCLUDE_DIR)
endif()
if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen)
add_library(Eigen3::Eigen INTERFACE IMPORTED)
set_target_properties(Eigen3::Eigen PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR}")
endif()
src/appleseed/renderer/kernel/rendering/rendererservices.h
+9 -9
View File
@@ -124,7 +124,7 @@ class RendererServices
OSL::ShaderGlobals* sg,
OSL::Matrix44& result,
OIIO::ustring from,
float time) override;
float time);
// Get the 4x4 matrix that transforms points from "common" space to
// the named 'to' coordinate system to at the given time. The
@@ -135,7 +135,7 @@ class RendererServices
OSL::ShaderGlobals* sg,
OSL::Matrix44& result,
OSL::ustring to,
float time) override;
float time);
// Get the 4x4 matrix that transforms 'from' to "common" space.
// Since there is no time value passed, return false if the
@@ -144,7 +144,7 @@ class RendererServices
bool get_matrix(
OSL::ShaderGlobals* sg,
OSL::Matrix44& result,
OIIO::ustring from) override;
OIIO::ustring from);
// Get the 4x4 matrix that transforms points from "common" space to
// the named 'to' coordinate system. Since there is no time value
@@ -156,7 +156,7 @@ class RendererServices
bool get_inverse_matrix(
OSL::ShaderGlobals* sg,
OSL::Matrix44& result,
OSL::ustring to) override;
OSL::ustring to);
// Transform points Pin[0..npoints-1] in named coordinate system
// 'from' into 'to' coordinates, storing the result in Pout[] using
@@ -189,7 +189,7 @@ class RendererServices
const OSL::Vec3* Pin,
OSL::Vec3* Pout,
int npoints,
OSL::TypeDesc::VECSEMANTICS vectype) override;
OSL::TypeDesc::VECSEMANTICS vectype);
// Immediately trace a ray from P in the direction R. Return true
// if anything hit, otherwise false.
@@ -212,7 +212,7 @@ class RendererServices
OIIO::ustring name,
OIIO::TypeDesc type,
void* val,
bool derivatives) override;
bool derivatives);
// Get the named attribute from the renderer and if found then
// write it into 'val'. Otherwise, return false. If no object is
@@ -232,7 +232,7 @@ class RendererServices
OIIO::ustring object,
OIIO::TypeDesc type,
OIIO::ustring name,
void* val) override;
void* val);
// Similar to get_attribute(); this method will return the 'index'
// element of an attribute array.
@@ -243,7 +243,7 @@ class RendererServices
OIIO::TypeDesc type,
OIIO::ustring name,
int index,
void* val) override;
void* val);
// Get the named user-data from the current object and write it into
// 'val'. If derivatives is true, the derivatives should be written into val
@@ -253,7 +253,7 @@ class RendererServices
OIIO::ustring name,
OIIO::TypeDesc type,
OSL::ShaderGlobals* sg,
void* val) override;
void* val);
private:
// This code is based on OSL's test renderer.