diff --git a/CMakeLists.txt b/CMakeLists.txt index 10a16133736f83ca688c49b2cf331ec7490e63ef..040d54b0bacf1f682a6e1a5711d556f452f1598c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,9 +22,9 @@ find_package(GLEW REQUIRED) find_package(Boost 1.58 REQUIRED COMPONENTS filesystem log program_options serialization date_time) set(${OGLPLUS_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/ext/oglplus/include - ${CMAKE_CURRENT_SOURCE_DIR}/ext/oglplus/implement - ${CMAKE_CURRENT_BINARY_DIR}/_build/include) + ${CMAKE_CURRENT_SOURCE_DIR}/ext/oglplus/include + ${CMAKE_CURRENT_SOURCE_DIR}/ext/oglplus/implement + ${CMAKE_CURRENT_BINARY_DIR}/_build/include) if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/_build/include) message("-- Configuring oglplus") execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ext/oglplus/configure.py @@ -43,7 +43,7 @@ if (NOT DEFINED GLCV_FULL_BUILD OR GLCV_FULL_BUILD) unset(CUDA_USE_STATIC_CUDA_RUNTIME CACHE) option(CUDA_USE_STATIC_CUDA_RUNTIME OFF) find_package(CUDA) - find_package(OpenCV 2.4.9.1 COMPONENTS core highgui imgproc gpu) + find_package(OpenCV 2.4.9.1 COMPONENTS core highgui imgproc gpu) set(NANOGUI_BUILD_EXAMPLE OFF CACHE BOOL " " FORCE) set(NANOGUI_BUILD_PYTHON OFF CACHE BOOL " " FORCE) @@ -210,7 +210,7 @@ if (GLCV_FULL_BUILD) ${SAMPLES_DIR}/infinite_zoom.ini "-r${SAMPLES_DIR}/infinite_zoom-noartifact.xml" ${CONFIGS_DIR}/noise.fsh) - render_sample(bad_noise_zoom ${SAMPLES_DIR}/bad_noise_zoom.ini + render_sample(bad_noise_zoom ${SAMPLES_DIR}/bad_noise_zoom.ini "" ${CONFIGS_DIR}/np.fsh) render_sample(tuning_noise_temporal