Cycles: new Microfacet-based Hair BSDF with elliptical cross-section support #105600

Merged
Weizhen Huang merged 114 commits from weizhen/blender:microfacet_hair into main 2023-08-18 12:46:20 +02:00
552 changed files with 10213 additions and 4196 deletions
Showing only changes of commit 9c9c18c659 - Show all commits

View File

@ -10,6 +10,11 @@ body:
By submitting code here, you agree that the code is (compatible with) GNU GPL v2 or later.
By default, all contributors are added to the AUTHORS file as part of a semi-automated process.
If you do not wish to be listed there and rather transfer copyright to the Blender Foundation please mention so at the bottom of the PR.
This request only needs to be made once and applies to future PR's.
- type: textarea
id: body
attributes:

17
AUTHORS
View File

@ -15,6 +15,9 @@
# See python fnmatch module documentation for more information.
#
# Please keep the list sorted.
#
# The individual authors section can be regenerated using:
# python ./tools/utils/authors_git_gen.py
# BEGIN individuals section.
Aaron Carlisle <carlisle.aaron00@gmail.com>
@ -25,7 +28,6 @@ Adrian Newton <TFS>
AgAmemnno <kaz380@hotmail.co.jp>
Aidan Davey <ShadowDragon>
Aidan Haile <tactical_fluke>
Alan <Al@AlanTroth.me.uk>
Alan Babu <alanaman>
Alan Troth <Al>
Alaska <alaskayou01@gmail.com>
@ -53,7 +55,6 @@ Ali-Erdinc-Koroglu <ali-erdinc-koroglu@noreply.localhost>
Aliaksandr Sharstniou <kartiz0l@noreply.localhost>
Alistair Sealy <alisealy>
Almaz Shinbay <almaz.shinbay@nu.edu.kz>
Almaz-Shinbay <almaz-shinbay@noreply.localhost>
Amélie Fondevilla <amelie.fondevilla@les-fees-speciales.coop>
Anatoly TechTonik <techtonik@gmail.com>
Andras-Borsanyi <andras-borsanyi@noreply.localhost>
@ -71,7 +72,6 @@ Angel Bueno <angelbpineda>
Angus Stanton <abstanton>
Ankit Meel <ankitjmeel@gmail.com>
Ankur Deria <DAnkur>
Anthony <anthony-roberts@noreply.localhost>
Anthony Edlin <akrashe@gmail.com>
Anthony Eriksson <Kony>
Anthony Roberts <anthony.roberts@linaro.org>
@ -185,7 +185,6 @@ Dominik Fill <dominikfill>
Domino Marama <domino@dominodesigns.info>
Dontsov Valentin <@blend4web.com>
Dorian <BD3D>
Dotsnov Valentin <invalid@nodomain.com>
Doug Hammond <doughammond@hamsterfight.co.uk>
Ed Halley <ed@halley.cc>
Edgar Roman Cervantes <redvant>
@ -271,7 +270,6 @@ Jacques Guignot <guignot@wanadoo.fr>
Jacques Lucke <jacques@blender.org>
Jagannadhan Ravi <easythrees>
Jaggz H <jaggz>
Jake <Welp>
Jakub Steiner <jimmac@gmail.com>
Jamell Moore <JamellMoore>
James <devpalestrina>
@ -374,7 +372,6 @@ Luc Revardel <luc.revardel@gmail.com>
Luca Bonavita <mindrones@gmail.com>
Luca Rood <dev@lucarood.com>
Lucas Boutrot <thornydre>
Lucas Tadeu <yup_lucas@noreply.localhost>
Lucas Tadeu Teixeira <lucas@lucastadeu.com>
Lucas Veber <lucky3>
Luis Pereira <LuisPereira>
@ -483,7 +480,6 @@ Pablo Dobarro <pablodp606@gmail.com>
Pablo Vazquez <pablo@blender.org>
Paolo Acampora <pkrime>
Pascal Schoen <pascal.schoen@adidas-group.com>
Pascal Schön <VanCantus>
Patrick Bender <ichbinkeinreh>
Patrick Busch <xylvier@noreply.localhost>
Patrick Foley <Patrick-Foley>
@ -512,7 +508,6 @@ Phoenix Katsch <phoenixkatsch>
Pi Lanningham <Quantumplation>
Pierluigi Grassi <pierluigi@tukano.it>
Pierre Risch <prisch>
PiloeGAO <leonumerique@gmail.com>
Piotr Makal <pmakal>
Piotr Ostrowski <postrowski>
Pratik Borhade <pratikborhade302@gmail.com>
@ -527,7 +522,6 @@ Rateeb Riyasat <bmollusc>
Ray Molenkamp <github@lazydodo.com>
Rebecca Dengate <beckyd>
Red Mser <RedMser>
RedMser <redmser.jj2@gmail.com>
Reinier de Blois <rddeblois@gmail.com>
Remigiusz Fiedler <migius@gmx.net>
Remy Fayet <rems64des@gmail.com>
@ -672,12 +666,9 @@ Zijun Zhou <eary@noreply.localhost>
andreas atteneder <atti>
b-init <b-init>
bird_d <bird_d>
bonj <jorijndegraaf@gmail.com>
brunoT <drehuwann@gmail.com>
cgtinker <Denys.Hsu@gmail.com>
demeterdzadik@gmail.com <demeterdzadik@gmail.com>
fiord <hyoga_quasar@yahoo.co.jp>
frogstomp <email.frogstomp@gmail.com>
himisa <himisa@noreply.localhost>
jim man <jimman2003>
jon denning <gfxcoder@gmail.com>
@ -690,8 +681,6 @@ n-kall <noa@tutamail.com>
nBurn <nbwashburn@gmail.com>
nutti <nutti.metro@gmail.com>
ok_what <ip1149a@gmail.com>
pembem22 <pembem22>
salipourto <sahar.alipourkashi@amd.com>
swann <slumber>
unclezeiv <davide.vercelli@gmail.com>
yves <valfeur>

View File

@ -650,7 +650,8 @@ if(NOT APPLE)
# Radeon VII (gfx906) not currently working with HIP SDK, so left out of the list.
set(CYCLES_HIP_BINARIES_ARCH
gfx900 gfx90c gfx902
gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 gfx1035
gfx1010 gfx1011 gfx1012
gfx1030 gfx1031 gfx1032 gfx1034 gfx1035 gfx1036
gfx1100 gfx1101 gfx1102
CACHE STRING "AMD HIP architectures to build binaries for"
)
@ -1266,8 +1267,12 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
unset(_is_CONFIG_DEBUG)
elseif(COMPILER_ASAN_LIBRARY)
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}")
set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY}")
set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY}")
if(DEFINED COMPILER_ASAN_LINKER_FLAGS)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} ${COMPILER_ASAN_LINKER_FLAGS}")
set(PLATFORM_LINKFLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG} ${COMPILER_ASAN_LINKER_FLAGS}")
endif()
endif()
endif()
endif()
@ -1433,7 +1438,12 @@ if(WITH_OPENVDB)
if(WITH_OPENVDB_BLOSC)
list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB_BLOSC)
list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES} ${ZLIB_LIBRARIES})
# Even when `WITH_OPENVDB_BLOSC` is set, `FindBlosc.cmake` isn't running.
# As this might be used at some point, check the libraries are defined.
if(DEFINED BLOSC_LIBRARIES)
list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES})
endif()
list(APPEND OPENVDB_LIBRARIES ${ZLIB_LIBRARIES})
endif()
list(APPEND OPENVDB_LIBRARIES ${BOOST_LIBRARIES} ${TBB_LIBRARIES})
@ -1729,6 +1739,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
CXX_WARN_UNUSED_PARAMETER -Wunused-parameter
CXX_WARN_WRITE_STRINGS -Wwrite-strings
CXX_WARN_UNDEF -Wundef
CXX_WARN_COMMA_SUBSCRIPT -Wcomma-subscript
CXX_WARN_FORMAT_SIGN -Wformat-signedness
CXX_WARN_RESTRICT -Wrestrict
CXX_WARN_NO_SUGGEST_OVERRIDE -Wno-suggest-override
@ -1962,6 +1973,12 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
unset(_WARNINGS)
endif()
# Xcode enables additional warning flags by default. Disable some to match
# command line build and other platforms more closely.
if(XCODE)
set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION NO)
endif()
# ensure python header is found since detection can fail, this could happen
# with _any_ library but since we used a fixed python version this tends to
# be most problematic.

View File

@ -547,7 +547,6 @@ source_archive_complete: .FORCE
# This assumes CMake is still using a default `PACKAGE_DIR` variable:
@$(PYTHON) ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
INKSCAPE_BIN?="inkscape"
icons: .FORCE
@BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \

View File

@ -50,7 +50,7 @@ set(OPENVDB_PATCH ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATC
if(APPLE)
set(OPENVDB_PATCH
${OPENVDB_PATCH} &&
${PATCH_CMD} -p 0 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_metal.diff
${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_metal.diff
)
endif()

View File

@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: GPL-2.0-or-later
set(SDL_PATCH ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff)
if(WIN32)
set(SDL_EXTRA_ARGS
-DSDL_STATIC=Off
@ -13,6 +15,14 @@ else()
-DSDL_VIDEO=OFF
-DSNDIO=OFF
)
# Core Haptics only available once macOS 11.0 becomes minimum.
if(APPLE AND NOT BLENDER_PLATFORM_ARM)
list(APPEND SDL_EXTRA_ARGS -DSDL_HAPTICS=OFF)
set(SDL_PATCH
${SDL_PATCH} &&
${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl_haptics.diff)
endif()
endif()
ExternalProject_Add(external_sdl
@ -20,7 +30,7 @@ ExternalProject_Add(external_sdl
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${SDL_HASH_TYPE}=${SDL_HASH}
PREFIX ${BUILD_DIR}/sdl
PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
PATCH_COMMAND ${SDL_PATCH}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/sdl
)

View File

@ -49,7 +49,7 @@ set(BOOST_HASH 077f074743ea7b0cb49c6ed43953ae95)
set(BOOST_HASH_TYPE MD5)
set(BOOST_FILE boost_${BOOST_VERSION_NODOTS}.tar.gz)
set(BOOST_CPE "cpe:2.3:a:boost:boost:${BOOST_VERSION}:*:*:*:*:*:*:*")
SET(BOOST_HOMEPAGE https://www.boost.org/)
set(BOOST_HOMEPAGE https://www.boost.org/)
set(BLOSC_VERSION 1.21.1)
set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
@ -100,7 +100,7 @@ set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE
set(FREETYPE_HASH 98bc3cf234fe88ef3cf24569251fe0a4)
set(FREETYPE_HASH_TYPE MD5)
set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)
SET(FREETYPE_CPE "cpe:2.3:a:freetype:freetype:${FREETYPE_VERSION}:*:*:*:*:*:*:*")
set(FREETYPE_CPE "cpe:2.3:a:freetype:freetype:${FREETYPE_VERSION}:*:*:*:*:*:*:*")
set(FREETYPE_HOMEPAGE https://freetype.org/)
set(EPOXY_VERSION 1.5.10)
@ -128,9 +128,9 @@ set(OPENSUBDIV_HASH 230f5cd2911d6240e58a3773b9c6e5e4)
set(OPENSUBDIV_HASH_TYPE MD5)
set(OPENSUBDIV_FILE opensubdiv-${OPENSUBDIV_VERSION}.tar.gz)
set(SDL_VERSION 2.0.20)
set(SDL_VERSION 2.28.2)
set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
set(SDL_HASH a53acc02e1cca98c4123229069b67c9e)
set(SDL_HASH 06ff379c406cd8318d18f0de81ee2709)
set(SDL_HASH_TYPE MD5)
set(SDL_FILE SDL2-${SDL_VERSION}.tar.gz)
set(SDL_CPE "cpe:2.3:a:libsdl:sdl:${SDL_VERSION}:*:*:*:*:*:*:*")
@ -460,7 +460,7 @@ set(BZIP2_HASH ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269)
set(BZIP2_HASH_TYPE SHA256)
set(BZIP2_FILE bzip2_${BZIP2_VERSION}.orig.tar.gz)
set(BZIP2_CPE "cpe:2.3:a:bzip:bzip2:${BZIP2_VERSION}:*:*:*:*:*:*:*")
SET(BZIP2_HOMEPAGE https://sourceware.org/bzip2/)
set(BZIP2_HOMEPAGE https://sourceware.org/bzip2/)
# NOTE: This will *HAVE* to match the version python ships on windows which
# is hardcoded in pythons PCbuild/get_externals.bat. For compliance reasons there
@ -471,7 +471,7 @@ set(FFI_HASH 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056)
set(FFI_HASH_TYPE SHA256)
set(FFI_FILE libffi-${FFI_VERSION}.tar.gz)
set(FFI_CPE "cpe:2.3:a:libffi_project:libffi:${FFI_VERSION}:*:*:*:*:*:*:*")
SET(FFI_HOMEPAGE https://sourceware.org/libffi/)
set(FFI_HOMEPAGE https://sourceware.org/libffi/)
set(LZMA_VERSION 5.2.5)
set(LZMA_URI https://tukaani.org/xz/xz-${LZMA_VERSION}.tar.bz2)
@ -778,7 +778,7 @@ set(AOM_URI https://storage.googleapis.com/aom-releases/libaom-${AOM_VERSION}.ta
set(AOM_HASH bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354)
set(AOM_HASH_TYPE SHA256)
set(AOM_FILE libaom-${AOM_VERSION}.tar.gz)
SET(AOM_HOMEPAGE https://aomedia.googlesource.com/aom/)
set(AOM_HOMEPAGE https://aomedia.googlesource.com/aom/)
set(FRIBIDI_VERSION v1.0.12)
set(FRIBIDI_URI https://github.com/fribidi/fribidi/archive/refs/tags/${FRIBIDI_VERSION}.tar.gz)

File diff suppressed because it is too large Load Diff

View File

@ -2,34 +2,14 @@ diff -ru ./src/video/SDL_video.c ./src/video/SDL_video.c
--- CMakeLists.txt.old 2016-01-02 12:56:31 -0700
+++ CMakeLists.txt 2016-10-03 11:24:24 -0600
@@ -609,7 +609,7 @@
list(APPEND EXTRA_LIBS m)
endif()
- check_library_exists(iconv iconv_open "" HAVE_LIBICONV)
+ #check_library_exists(iconv iconv_open "" HAVE_LIBICONV)
if(HAVE_LIBICONV)
list(APPEND EXTRA_LIBS iconv)
set(HAVE_ICONV 1)
--- src/video/SDL_video.c 2018-09-10 23:27:57.000000000 +0200
+++ src/video/SDL_video.c 2018-09-10 23:28:09.000000000 +0200
@@ -1176,7 +1176,7 @@
return 0;
}
-#ifdef __MACOSX__
+#if defined(__MACOSX__) && SDL_VIDEO_DRIVER_COCOA
/* if the window is going away and no resolution change is necessary,
do nothing, or else we may trigger an ugly double-transition
*/
@@ -2563,7 +2563,7 @@
return SDL_FALSE;
}
-#ifdef __MACOSX__
+#if defined(__MACOSX__) && SDL_VIDEO_DRIVER_COCOA
if (SDL_strcmp(_this->name, "cocoa") == 0) { /* don't do this for X11, etc */
if (Cocoa_IsWindowInFullscreenSpace(window)) {
return SDL_FALSE;
if(SDL_SYSTEM_ICONV)
- check_library_exists(iconv iconv_open "" HAVE_LIBICONV)
+ #check_library_exists(iconv iconv_open "" HAVE_LIBICONV)
if(HAVE_LIBICONV)
list(APPEND EXTRA_LIBS iconv)
set(HAVE_ICONV 1)
--- CMakeLists.txt 2022-12-09 20:40:00
+++ CMakeLists.txt 2022-12-09 20:40:00
@@ -526,6 +526,13 @@

View File

@ -0,0 +1,12 @@
--- src/joystick/iphoneos/SDL_mfijoystick.m 2023-08-16 18:57:36
+++ src/joystick/iphoneos/SDL_mfijoystick.m2 2023-08-16 18:57:25
@@ -95,7 +95,8 @@
#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= 140000) || (__APPLETV_OS_VERSION_MAX_ALLOWED >= 140000) || (__MAC_OS_VERSION_MAX_ALLOWED > 1500000) || (__MAC_OS_X_VERSION_MAX_ALLOWED > 101600)
#define ENABLE_MFI_BATTERY
-#define ENABLE_MFI_RUMBLE
+// BLENDER: disable until macOS 11.0 becomes the minimum version and Core Haptics is available.
+//#define ENABLE_MFI_RUMBLE
#define ENABLE_MFI_LIGHT
#define ENABLE_MFI_SENSORS
#define ENABLE_MFI_SYSTEM_GESTURE_STATE

View File

@ -14,20 +14,20 @@
#
# If `ALEMBIC_ROOT_DIR` was defined in the environment, use it.
IF(DEFINED ALEMBIC_ROOT_DIR)
if(DEFINED ALEMBIC_ROOT_DIR)
# Pass.
ELSEIF(DEFINED ENV{ALEMBIC_ROOT_DIR})
SET(ALEMBIC_ROOT_DIR $ENV{ALEMBIC_ROOT_DIR})
ELSE()
SET(ALEMBIC_ROOT_DIR "")
ENDIF()
elseif(DEFINED ENV{ALEMBIC_ROOT_DIR})
set(ALEMBIC_ROOT_DIR $ENV{ALEMBIC_ROOT_DIR})
else()
set(ALEMBIC_ROOT_DIR "")
endif()
SET(_alembic_SEARCH_DIRS
set(_alembic_SEARCH_DIRS
${ALEMBIC_ROOT_DIR}
/opt/lib/alembic
)
FIND_PATH(ALEMBIC_INCLUDE_DIR
find_path(ALEMBIC_INCLUDE_DIR
NAMES
Alembic/Abc/All.h
HINTS
@ -36,7 +36,7 @@ FIND_PATH(ALEMBIC_INCLUDE_DIR
include
)
FIND_LIBRARY(ALEMBIC_LIBRARY
find_library(ALEMBIC_LIBRARY
NAMES
Alembic
HINTS
@ -47,17 +47,17 @@ FIND_LIBRARY(ALEMBIC_LIBRARY
# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Alembic DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Alembic DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR)
IF(ALEMBIC_FOUND)
SET(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY})
SET(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
ENDIF()
if(ALEMBIC_FOUND)
set(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARY})
set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
endif()
MARK_AS_ADVANCED(
mark_as_advanced(
ALEMBIC_INCLUDE_DIR
ALEMBIC_LIBRARY
)
UNSET(_alembic_SEARCH_DIRS)
unset(_alembic_SEARCH_DIRS)

View File

@ -15,22 +15,22 @@
# AUDASPACE_PY_INCLUDE_DIRS - the audaspace's python binding include directories
# AUDASPACE_PY_LIBRARIES - link these to use audaspace's python binding
IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "")
SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
ENDIF()
if(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "")
set(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
endif()
SET(_audaspace_SEARCH_DIRS
set(_audaspace_SEARCH_DIRS
${AUDASPACE_ROOT_DIR}
)
# Use pkg-config to get hints about paths
FIND_PACKAGE(PkgConfig)
IF(PKG_CONFIG_FOUND)
PKG_CHECK_MODULES(AUDASPACE_PKGCONF audaspace)
ENDIF()
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
pkg_check_modules(AUDASPACE_PKGCONF audaspace)
endif()
# Include dir
FIND_PATH(AUDASPACE_INCLUDE_DIR
find_path(AUDASPACE_INCLUDE_DIR
NAMES ISound.h
HINTS ${_audaspace_SEARCH_DIRS}
PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
@ -38,7 +38,7 @@ FIND_PATH(AUDASPACE_INCLUDE_DIR
)
# Library
FIND_LIBRARY(AUDASPACE_LIBRARY
find_library(AUDASPACE_LIBRARY
NAMES audaspace
HINTS ${_audaspace_SEARCH_DIRS}
PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
@ -46,7 +46,7 @@ FIND_LIBRARY(AUDASPACE_LIBRARY
)
# Include dir
FIND_PATH(AUDASPACE_C_INCLUDE_DIR
find_path(AUDASPACE_C_INCLUDE_DIR
NAMES AUD_Sound.h
HINTS ${_audaspace_SEARCH_DIRS}
PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
@ -54,7 +54,7 @@ FIND_PATH(AUDASPACE_C_INCLUDE_DIR
)
# Library
FIND_LIBRARY(AUDASPACE_C_LIBRARY
find_library(AUDASPACE_C_LIBRARY
NAMES audaspace-c
HINTS ${_audaspace_SEARCH_DIRS}
PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
@ -62,7 +62,7 @@ FIND_LIBRARY(AUDASPACE_C_LIBRARY
)
# Include dir
FIND_PATH(AUDASPACE_PY_INCLUDE_DIR
find_path(AUDASPACE_PY_INCLUDE_DIR
NAMES python/PyAPI.h
HINTS ${_audaspace_SEARCH_DIRS}
PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
@ -70,34 +70,34 @@ FIND_PATH(AUDASPACE_PY_INCLUDE_DIR
)
# Library
FIND_LIBRARY(AUDASPACE_PY_LIBRARY
find_library(AUDASPACE_PY_LIBRARY
NAMES audaspace-py
HINTS ${_audaspace_SEARCH_DIRS}
PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
PATH_SUFFIXES lib lib64
)
FIND_PACKAGE(PackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace DEFAULT_MSG AUDASPACE_LIBRARY AUDASPACE_INCLUDE_DIR)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_C DEFAULT_MSG AUDASPACE_C_LIBRARY AUDASPACE_C_INCLUDE_DIR)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_Py DEFAULT_MSG AUDASPACE_PY_LIBRARY AUDASPACE_PY_INCLUDE_DIR)
find_package(PackageHandleStandardArgs)
find_package_handle_standard_args(Audaspace DEFAULT_MSG AUDASPACE_LIBRARY AUDASPACE_INCLUDE_DIR)
find_package_handle_standard_args(Audaspace_C DEFAULT_MSG AUDASPACE_C_LIBRARY AUDASPACE_C_INCLUDE_DIR)
find_package_handle_standard_args(Audaspace_Py DEFAULT_MSG AUDASPACE_PY_LIBRARY AUDASPACE_PY_INCLUDE_DIR)
IF(AUDASPACE_FOUND)
SET(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY})
SET(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR})
ENDIF()
if(AUDASPACE_FOUND)
set(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY})
set(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR})
endif()
IF(AUDASPACE_C_FOUND)
SET(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY})
SET(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR})
ENDIF()
if(AUDASPACE_C_FOUND)
set(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY})
set(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR})
endif()
IF(AUDASPACE_PY_FOUND)
SET(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY})
SET(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR})
ENDIF()
if(AUDASPACE_PY_FOUND)
set(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY})
set(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR})
endif()
MARK_AS_ADVANCED(
mark_as_advanced(
AUDASPACE_LIBRARY
AUDASPACE_LIBRARIES
AUDASPACE_INCLUDE_DIR

View File

@ -16,20 +16,20 @@
# BLOSC_LIBRARY, where to find the Blosc library.
# If `BLOSC_ROOT_DIR` was defined in the environment, use it.
IF(DEFINED BLOSC_ROOT_DIR)
if(DEFINED BLOSC_ROOT_DIR)
# Pass.
ELSEIF(DEFINED ENV{BLOSC_ROOT_DIR})
SET(BLOSC_ROOT_DIR $ENV{BLOSC_ROOT_DIR})
ELSE()
SET(BLOSC_ROOT_DIR "")
ENDIF()
elseif(DEFINED ENV{BLOSC_ROOT_DIR})
set(BLOSC_ROOT_DIR $ENV{BLOSC_ROOT_DIR})
else()
set(BLOSC_ROOT_DIR "")
endif()
SET(_blosc_SEARCH_DIRS
set(_blosc_SEARCH_DIRS
${BLOSC_ROOT_DIR}
/opt/lib/blosc
)
FIND_PATH(BLOSC_INCLUDE_DIR
find_path(BLOSC_INCLUDE_DIR
NAMES
blosc.h
HINTS
@ -38,7 +38,7 @@ FIND_PATH(BLOSC_INCLUDE_DIR
include
)
FIND_LIBRARY(BLOSC_LIBRARY
find_library(BLOSC_LIBRARY
NAMES
blosc
HINTS
@ -49,18 +49,18 @@ FIND_LIBRARY(BLOSC_LIBRARY
# handle the QUIETLY and REQUIRED arguments and set BLOSC_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Blosc DEFAULT_MSG
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Blosc DEFAULT_MSG
BLOSC_LIBRARY BLOSC_INCLUDE_DIR)
IF(BLOSC_FOUND)
SET(BLOSC_LIBRARIES ${BLOSC_LIBRARY})
SET(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIR})
ELSE()
SET(BLOSC_BLOSC_FOUND FALSE)
ENDIF()
if(BLOSC_FOUND)
set(BLOSC_LIBRARIES ${BLOSC_LIBRARY})
set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIR})
else()
set(BLOSC_BLOSC_FOUND FALSE)
endif()
MARK_AS_ADVANCED(
mark_as_advanced(
BLOSC_INCLUDE_DIR
BLOSC_LIBRARY
)

View File

@ -13,19 +13,19 @@
#
# If `BROTLI_ROOT_DIR` was defined in the environment, use it.
IF(DEFINED BROTLI_ROOT_DIR)
if(DEFINED BROTLI_ROOT_DIR)
# Pass.
ELSEIF(DEFINED ENV{BROTLI_ROOT_DIR})
SET(BROTLI_ROOT_DIR $ENV{BROTLI_ROOT_DIR})
ELSE()
SET(BROTLI_ROOT_DIR "")
ENDIF()
elseif(DEFINED ENV{BROTLI_ROOT_DIR})
set(BROTLI_ROOT_DIR $ENV{BROTLI_ROOT_DIR})
else()
set(BROTLI_ROOT_DIR "")
endif()
SET(_BROTLI_SEARCH_DIRS
set(_BROTLI_SEARCH_DIRS
${BROTLI_ROOT_DIR}
)
FIND_PATH(BROTLI_INCLUDE_DIR
find_path(BROTLI_INCLUDE_DIR
NAMES
brotli/decode.h
HINTS
@ -35,7 +35,7 @@ FIND_PATH(BROTLI_INCLUDE_DIR
DOC "Brotli header files"
)
FIND_LIBRARY(BROTLI_LIBRARY_COMMON
find_library(BROTLI_LIBRARY_COMMON
NAMES
# Some builds use a special `-static` postfix in their static libraries names.
brotlicommon-static
@ -46,7 +46,7 @@ FIND_LIBRARY(BROTLI_LIBRARY_COMMON
lib64 lib lib/static
DOC "Brotli static common library"
)
FIND_LIBRARY(BROTLI_LIBRARY_DEC
find_library(BROTLI_LIBRARY_DEC
NAMES
# Some builds use a special `-static` postfix in their static libraries names.
brotlidec-static
@ -59,26 +59,26 @@ FIND_LIBRARY(BROTLI_LIBRARY_DEC
)
IF(${BROTLI_LIBRARY_COMMON_NOTFOUND} or ${BROTLI_LIBRARY_DEC_NOTFOUND})
if((NOT BROTLI_LIBRARY_COMMON) OR (NOT BROTLI_LIBRARY_DEC))
set(BROTLI_FOUND FALSE)
ELSE()
else()
# handle the QUIETLY and REQUIRED arguments and set BROTLI_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Brotli DEFAULT_MSG BROTLI_LIBRARY_COMMON BROTLI_LIBRARY_DEC BROTLI_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Brotli DEFAULT_MSG BROTLI_LIBRARY_COMMON BROTLI_LIBRARY_DEC BROTLI_INCLUDE_DIR)
IF(BROTLI_FOUND)
if(BROTLI_FOUND)
get_filename_component(BROTLI_LIBRARY_DIR ${BROTLI_LIBRARY_COMMON} DIRECTORY)
SET(BROTLI_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR})
SET(BROTLI_LIBRARIES ${BROTLI_LIBRARY_DEC} ${BROTLI_LIBRARY_COMMON})
ENDIF()
ENDIF()
set(BROTLI_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR})
set(BROTLI_LIBRARIES ${BROTLI_LIBRARY_DEC} ${BROTLI_LIBRARY_COMMON})
endif()
endif()
MARK_AS_ADVANCED(
mark_as_advanced(
BROTLI_INCLUDE_DIR
BROTLI_LIBRARY_COMMON
BROTLI_LIBRARY_DEC
BROTLI_LIBRARY_DIR
)
UNSET(_BROTLI_SEARCH_DIRS)
unset(_BROTLI_SEARCH_DIRS)

View File

@ -12,19 +12,19 @@
# EIGEN3_FOUND, If false, do not try to use Eigen3.
# If `EIGEN3_ROOT_DIR` was defined in the environment, use it.
IF(DEFINED EIGEN3_ROOT_DIR)
if(DEFINED EIGEN3_ROOT_DIR)
# Pass.
ELSEIF(DEFINED ENV{EIGEN3_ROOT_DIR})
SET(EIGEN3_ROOT_DIR $ENV{EIGEN3_ROOT_DIR})
ELSE()
SET(EIGEN3_ROOT_DIR "")
ENDIF()
elseif(DEFINED ENV{EIGEN3_ROOT_DIR})
set(EIGEN3_ROOT_DIR $ENV{EIGEN3_ROOT_DIR})
else()
set(EIGEN3_ROOT_DIR "")
endif()
SET(_eigen3_SEARCH_DIRS
set(_eigen3_SEARCH_DIRS
${EIGEN3_ROOT_DIR}
)
FIND_PATH(EIGEN3_INCLUDE_DIR
find_path(EIGEN3_INCLUDE_DIR
NAMES
# header has no '.h' suffix
Eigen/Eigen
@ -36,14 +36,14 @@ FIND_PATH(EIGEN3_INCLUDE_DIR
# handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eigen3 DEFAULT_MSG
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Eigen3 DEFAULT_MSG
EIGEN3_INCLUDE_DIR)
IF(EIGEN3_FOUND)
SET(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
ENDIF()
if(EIGEN3_FOUND)
set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
endif()
MARK_AS_ADVANCED(
mark_as_advanced(
EIGEN3_INCLUDE_DIR
)

View File

@ -13,20 +13,20 @@
# EMBREEFOUND, If false, do not try to use Embree.
# If `EMBREE_ROOT_DIR` was defined in the environment, use it.
IF(DEFINED EMBREE_ROOT_DIR)
if(DEFINED EMBREE_ROOT_DIR)
# Pass.
ELSEIF(DEFINED ENV{EMBREE_ROOT_DIR})
SET(EMBREE_ROOT_DIR $ENV{EMBREE_ROOT_DIR})
ELSE()
SET(EMBREE_ROOT_DIR "")
ENDIF()
elseif(DEFINED ENV{EMBREE_ROOT_DIR})
set(EMBREE_ROOT_DIR $ENV{EMBREE_ROOT_DIR})
else()
set(EMBREE_ROOT_DIR "")
endif()
SET(_embree_SEARCH_DIRS
set(_embree_SEARCH_DIRS
${EMBREE_ROOT_DIR}
/opt/lib/embree
)
FIND_PATH(EMBREE_INCLUDE_DIR
find_path(EMBREE_INCLUDE_DIR
NAMES
embree4/rtcore.h
embree3/rtcore.h
@ -36,44 +36,44 @@ FIND_PATH(EMBREE_INCLUDE_DIR
include
)
IF(EXISTS ${EMBREE_INCLUDE_DIR}/embree4/rtcore_config.h)
SET(EMBREE_MAJOR_VERSION 4)
ELSE()
SET(EMBREE_MAJOR_VERSION 3)
ENDIF()
if(EXISTS ${EMBREE_INCLUDE_DIR}/embree4/rtcore_config.h)
set(EMBREE_MAJOR_VERSION 4)
else()
set(EMBREE_MAJOR_VERSION 3)
endif()
IF(EMBREE_INCLUDE_DIR)
FILE(READ ${EMBREE_INCLUDE_DIR}/embree${EMBREE_MAJOR_VERSION}/rtcore_config.h _embree_config_header)
IF(_embree_config_header MATCHES "#define EMBREE_STATIC_LIB")
SET(EMBREE_STATIC_LIB TRUE)
ELSE()
SET(EMBREE_STATIC_LIB FALSE)
ENDIF()
IF(_embree_config_header MATCHES "#define EMBREE_SYCL_SUPPORT")
SET(EMBREE_SYCL_SUPPORT TRUE)
ELSE()
SET(EMBREE_SYCL_SUPPORT FALSE)
ENDIF()
UNSET(_embree_config_header)
ENDIF()
if(EMBREE_INCLUDE_DIR)
file(READ ${EMBREE_INCLUDE_DIR}/embree${EMBREE_MAJOR_VERSION}/rtcore_config.h _embree_config_header)
if(_embree_config_header MATCHES "#define EMBREE_STATIC_LIB")
set(EMBREE_STATIC_LIB TRUE)
else()
set(EMBREE_STATIC_LIB FALSE)
endif()
if(_embree_config_header MATCHES "#define EMBREE_SYCL_SUPPORT")
set(EMBREE_SYCL_SUPPORT TRUE)
else()
set(EMBREE_SYCL_SUPPORT FALSE)
endif()
unset(_embree_config_header)
endif()
IF(EMBREE_STATIC_LIB)
IF(NOT (("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") OR (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))))
SET(_embree_SIMD_COMPONENTS
if(EMBREE_STATIC_LIB)
if(NOT (("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") OR (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))))
set(_embree_SIMD_COMPONENTS
embree_sse42
embree_avx
embree_avx2
)
ENDIF()
endif()
IF(EMBREE_SYCL_SUPPORT)
SET(_embree_GPU_COMPONENTS
if(EMBREE_SYCL_SUPPORT)
set(_embree_GPU_COMPONENTS
embree4_sycl
embree_rthwif
)
ENDIF()
endif()
SET(_embree_FIND_COMPONENTS
set(_embree_FIND_COMPONENTS
embree${EMBREE_MAJOR_VERSION}
${_embree_SIMD_COMPONENTS}
${_embree_GPU_COMPONENTS}
@ -83,21 +83,21 @@ IF(EMBREE_STATIC_LIB)
sys
tasking
)
ELSE()
SET(_embree_FIND_COMPONENTS
else()
set(_embree_FIND_COMPONENTS
embree${EMBREE_MAJOR_VERSION}
)
IF(EMBREE_SYCL_SUPPORT)
LIST(APPEND _embree_FIND_COMPONENTS
if(EMBREE_SYCL_SUPPORT)
list(APPEND _embree_FIND_COMPONENTS
embree4_sycl
)
ENDIF()
ENDIF()
endif()
endif()
SET(_embree_LIBRARIES)
FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
FIND_LIBRARY(EMBREE_${UPPERCOMPONENT}_LIBRARY
set(_embree_LIBRARIES)
foreach(COMPONENT ${_embree_FIND_COMPONENTS})
string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
find_library(EMBREE_${UPPERCOMPONENT}_LIBRARY
NAMES
${COMPONENT}
HINTS
@ -105,32 +105,32 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
PATH_SUFFIXES
lib64 lib
)
LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}")
ENDFOREACH()
list(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}")
endforeach()
# handle the QUIETLY and REQUIRED arguments and set EMBREE_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Embree DEFAULT_MSG
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Embree DEFAULT_MSG
_embree_LIBRARIES EMBREE_INCLUDE_DIR)
IF(EMBREE_FOUND)
SET(EMBREE_LIBRARIES ${_embree_LIBRARIES})
SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR})
ENDIF()
if(EMBREE_FOUND)
set(EMBREE_LIBRARIES ${_embree_LIBRARIES})
set(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR})
endif()
MARK_AS_ADVANCED(
mark_as_advanced(
EMBREE_INCLUDE_DIR
EMBREE_MAJOR_VERSION
EMBREE_SYCL_SUPPORT
EMBREE_STATIC_LIB
)
FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
MARK_AS_ADVANCED(EMBREE_${UPPERCOMPONENT}_LIBRARY)
ENDFOREACH()
foreach(COMPONENT ${_embree_FIND_COMPONENTS})
string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
mark_as_advanced(EMBREE_${UPPERCOMPONENT}_LIBRARY)
endforeach()
UNSET(_embree_SEARCH_DIRS)
UNSET(_embree_FIND_COMPONENTS)
UNSET(_embree_LIBRARIES)
unset(_embree_SEARCH_DIRS)
unset(_embree_FIND_COMPONENTS)
unset(_embree_LIBRARIES)

View File

@ -10,15 +10,15 @@
# Epoxy_FOUND, If false, do not try to use epoxy.
# If `EPOXY_ROOT_DIR` was defined in the environment, use it.
IF(DEFINED EPOXY_ROOT_DIR)
if(DEFINED EPOXY_ROOT_DIR)
# Pass.
ELSEIF(DEFINED ENV{EPOXY_ROOT_DIR})
SET(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR})
ELSE()
SET(EPOXY_ROOT_DIR "")
ENDIF()
elseif(DEFINED ENV{EPOXY_ROOT_DIR})
set(EPOXY_ROOT_DIR $ENV{EPOXY_ROOT_DIR})
else()
set(EPOXY_ROOT_DIR "")
endif()
FIND_PATH(Epoxy_INCLUDE_DIR
find_path(Epoxy_INCLUDE_DIR
NAMES
epoxy/gl.h
HINTS
@ -27,7 +27,7 @@ FIND_PATH(Epoxy_INCLUDE_DIR
include
)
FIND_LIBRARY(Epoxy_LIBRARY
find_library(Epoxy_LIBRARY
NAMES
epoxy
HINTS
@ -38,16 +38,16 @@ FIND_LIBRARY(Epoxy_LIBRARY
# handle the QUIETLY and REQUIRED arguments and set Epoxy_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Epoxy DEFAULT_MSG
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Epoxy DEFAULT_MSG
Epoxy_LIBRARY Epoxy_INCLUDE_DIR)
IF(Epoxy_FOUND)
SET(Epoxy_INCLUDE_DIRS ${Epoxy_INCLUDE_DIR})
SET(Epoxy_LIBRARIES ${Epoxy_LIBRARY})
ENDIF()
if(Epoxy_FOUND)
set(Epoxy_INCLUDE_DIRS ${Epoxy_INCLUDE_DIR})
set(Epoxy_LIBRARIES ${Epoxy_LIBRARY})
endif()
MARK_AS_ADVANCED(
mark_as_advanced(
Epoxy_INCLUDE_DIR
Epoxy_LIBRARY
)

View File

@ -73,10 +73,10 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(FFmpeg DEFAULT_MSG
_ffmpeg_LIBRARIES _ffmpeg_INCLUDE_DIR)
IF(FFMPEG_FOUND)
if(FFMPEG_FOUND)
set(FFMPEG_LIBRARIES ${_ffmpeg_LIBRARIES})
set(FFMPEG_INCLUDE_DIRS ${_ffmpeg_INCLUDE_DIR})
ENDIF()
endif()
mark_as_advanced(
FFMPEG_INCLUDE_DIR

View File

@ -16,19 +16,19 @@
# FFTW3_LIBRARY, where to find the Fftw3 library.
# If `FFTW3_ROOT_DIR` was defined in the environment, use it.
IF(DEFINED FFTW3_ROOT_DIR)
if(DEFINED FFTW3_ROOT_DIR)
# Pass.
ELSEIF(DEFINED ENV{FFTW3_ROOT_DIR})
SET(FFTW3_ROOT_DIR $ENV{FFTW3_ROOT_DIR})
ELSE()
SET(FFTW3_ROOT_DIR "")
ENDIF()
elseif(DEFINED ENV{FFTW3_ROOT_DIR})
set(FFTW3_ROOT_DIR $ENV{FFTW3_ROOT_DIR})
else()
set(FFTW3_ROOT_DIR "")
endif()
SET(_fftw3_SEARCH_DIRS
set(_fftw3_SEARCH_DIRS
${FFTW3_ROOT_DIR}
)
FIND_PATH(FFTW3_INCLUDE_DIR
find_path(FFTW3_INCLUDE_DIR
NAMES
fftw3.h
HINTS
@ -37,7 +37,7 @@ FIND_PATH(FFTW3_INCLUDE_DIR
include
)
FIND_LIBRARY(FFTW3_LIBRARY
find_library(FFTW3_LIBRARY
NAMES
fftw3
HINTS
@ -48,16 +48,16 @@ FIND_LIBRARY(FFTW3_LIBRARY
# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fftw3 DEFAULT_MSG
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Fftw3 DEFAULT_MSG
FFTW3_LIBRARY FFTW3_INCLUDE_DIR)
IF(FFTW3_FOUND)
SET(FFTW3_LIBRARIES ${FFTW3_LIBRARY})
SET(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR})
ENDIF()
if(FFTW3_FOUND)
set(FFTW3_LIBRARIES ${FFTW3_LIBRARY})
set(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR})
endif()
MARK_AS_ADVANCED(
mark_as_advanced(
FFTW3_INCLUDE_DIR
FFTW3_LIBRARY
)