From d9dae773dced2264283a8a8b3fe7b97ccf01c86a Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sat, 28 Feb 2015 10:24:32 +0000 Subject: [PATCH] Simplify the BUILD_EXAMPLES logic --- CMakeLists.txt | 3 ++- examples/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42c4b773..f109c97a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,9 +48,10 @@ endif() ADD_SUBDIRECTORY(include) OPTION(ENABLE_EXAMPLES "Should the examples be built" ON) -SET(BUILD_EXAMPLES OFF) IF(ENABLE_EXAMPLES) ADD_SUBDIRECTORY(examples) +ELSE() + SET(BUILD_EXAMPLES OFF) ENDIF() INCLUDE(Packaging.cmake) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 64356460..8086db10 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -11,4 +11,6 @@ if(Qt5OpenGL_FOUND) ADD_SUBDIRECTORY(SmoothLOD) ADD_SUBDIRECTORY(DecodeOnGPU) ADD_SUBDIRECTORY(Python) +else() + SET(BUILD_EXAMPLES OFF PARENT_SCOPE) endif()