Merge pull request #6918 from jet47:gpu-opengl-sample-build

This commit is contained in:
Alexander Alekhin 2016-07-15 16:52:42 +00:00
commit 69c4e84dad

View File

@ -81,9 +81,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
if(NOT WITH_OPENGL) if(NOT HAVE_OPENGL)
list(REMOVE_ITEM all_samples "opengl.cpp") list(REMOVE_ITEM all_samples "opengl.cpp")
endif(NOT WITH_OPENGL) endif()
foreach(sample_filename ${all_samples}) foreach(sample_filename ${all_samples})
get_filename_component(sample ${sample_filename} NAME_WE) get_filename_component(sample ${sample_filename} NAME_WE)
@ -96,9 +96,9 @@ endif()
if(INSTALL_C_EXAMPLES AND NOT WIN32) if(INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
if(NOT WITH_OPENGL) if(NOT HAVE_OPENGL)
list(REMOVE_ITEM install_list "opengl.cpp") list(REMOVE_ITEM install_list "opengl.cpp")
endif(NOT WITH_OPENGL) endif()
install(FILES ${install_list} install(FILES ${install_list}
DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples) PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)