Skip to content

make BUILD_GRAPHICAL_EXAMPLES depend on BUILD_EXAMPLES #8822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2021
Merged

make BUILD_GRAPHICAL_EXAMPLES depend on BUILD_EXAMPLES #8822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,34 @@ add_subdirectory(fw-logger)
add_subdirectory(terminal)
add_subdirectory(recorder)
add_subdirectory(fw-update)
endif()

if(NOT WIN32)
if(BUILD_NETWORK_DEVICE)
add_subdirectory(rs-server)
endif()
endif()
endif()

if(BUILD_GRAPHICAL_EXAMPLES)
include(${CMAKE_SOURCE_DIR}/CMake/opengl_config.cmake)
if (NOT BUILD_GLSL_EXTENSIONS)
MESSAGE(STATUS "BUILD_GRAPHICAL_EXAMPLES explicitely depends on BUILD_GLSL_EXTENSIONS, set it ON")
SET(BUILD_GLSL_EXTENSIONS ON)
endif()
set(DEPENDENCIES ${DEPENDENCIES} realsense2-gl)
add_subdirectory(data-collect)
add_subdirectory(realsense-viewer)
add_subdirectory(depth-quality)
add_subdirectory(rosbag-inspector)
add_subdirectory(benchmark)
else()
if(ANDROID_NDK_TOOLCHAIN_INCLUDED)
find_library(log-lib log)
add_dependencies(RealsenseTools log)
set(DEPENDENCIES ${DEPENDENCIES} log)
#else()
# set(DEPENDENCIES realsense2)
if(BUILD_EXAMPLES)
if(BUILD_GRAPHICAL_EXAMPLES)
include(${CMAKE_SOURCE_DIR}/CMake/opengl_config.cmake)
if (NOT BUILD_GLSL_EXTENSIONS)
MESSAGE(STATUS "BUILD_GRAPHICAL_EXAMPLES explicitely depends on BUILD_GLSL_EXTENSIONS, set it ON")
SET(BUILD_GLSL_EXTENSIONS ON)
endif()
set(DEPENDENCIES ${DEPENDENCIES} realsense2-gl)
add_subdirectory(data-collect)
add_subdirectory(realsense-viewer)
add_subdirectory(depth-quality)
add_subdirectory(rosbag-inspector)
add_subdirectory(benchmark)
else()
if(ANDROID_NDK_TOOLCHAIN_INCLUDED)
find_library(log-lib log)
add_dependencies(RealsenseTools log)
set(DEPENDENCIES ${DEPENDENCIES} log)
#else()
# set(DEPENDENCIES realsense2)
endif()
endif()
endif()