merged 'hdr_tonemap_fattal_nocache' into 'dev'

This commit is contained in:
Alberto Griggio
2017-11-18 17:44:34 +01:00
32 changed files with 1997 additions and 128 deletions

View File

@@ -311,6 +311,7 @@ if(WITH_SYSTEM_KLT)
find_package(KLT REQUIRED)
endif()
# Check for libcanberra-gtk3 (sound events on Linux):
if(UNIX AND(NOT APPLE))
pkg_check_modules(CANBERRA-GTK REQUIRED libcanberra-gtk3)
@@ -345,6 +346,35 @@ if(OPTION_OMP)
endif()
endif()
# check for libfftw3f_omp
include(CheckCSourceCompiles)
if(OPENMP_FOUND)
set(CMAKE_REQUIRED_INCLUDES ${FFTW3F_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES)
foreach(l ${FFTW3F_LIBRARIES})
find_library(_f ${l} PATHS ${FFTW3F_LIBRARY_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${_f})
endforeach()
check_c_source_compiles(
"#include <fftw3.h>
int main()
{
fftwf_init_threads();
fftwf_plan_with_nthreads(1);
return 0;
}" _fftw3f_multithread)
if(_fftw3f_multithread)
add_definitions(-DRT_FFTW3F_OMP)
else()
find_library(fftw3f_omp fftw3f_omp PATHS ${FFTW3F_LIBRARY_DIRS})
if(fftw3f_omp)
add_definitions(-DRT_FFTW3F_OMP)
set(FFTW3F_LIBRARIES ${FFTW3F_LIBRARIES} ${fftw3f_omp})
endif()
endif()
endif()
# Find out whether we are building out of source:
get_filename_component(ABS_SOURCE_DIR "${PROJECT_SOURCE_DIR}" ABSOLUTE)
get_filename_component(ABS_BINARY_DIR "${CMAKE_BINARY_DIR}" ABSOLUTE)