From 32b07659a81dec6fdf4ba8b5c05d38dbb1f97aa3 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sat, 28 Feb 2015 10:19:17 +0000 Subject: [PATCH] Move all the examples' CMake logic into the examples directory --- CMakeLists.txt | 19 +++---------------- examples/CMakeLists.txt | 21 ++++++++++++++------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae06757f..42c4b773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,16 +33,10 @@ MARK_AS_ADVANCED(FORCE POLYVOX_VERSION) SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) include(FeatureSummary) -OPTION(ENABLE_EXAMPLES "Should the examples be built" ON) - -# Qt is required for building the tests, the example and optionally for bundling the documentation find_package(Qt5Test 5.2) -find_package(Qt5OpenGL 5.2) set_package_properties(Qt5Test PROPERTIES DESCRIPTION "C++ framework" URL http://qt-project.org) set_package_properties(Qt5Test PROPERTIES TYPE OPTIONAL PURPOSE "Building the tests") -set_package_properties(Qt5OpenGL PROPERTIES DESCRIPTION "C++ framework" URL http://qt-project.org) -set_package_properties(Qt5OpenGL PROPERTIES TYPE RECOMMENDED PURPOSE "Building the examples") IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW" ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode @@ -54,16 +48,9 @@ endif() ADD_SUBDIRECTORY(include) OPTION(ENABLE_EXAMPLES "Should the examples be built" ON) -IF(ENABLE_EXAMPLES AND Qt5OpenGL_FOUND) - ADD_SUBDIRECTORY(examples/Basic) - ADD_SUBDIRECTORY(examples/Paging) - ADD_SUBDIRECTORY(examples/OpenGL) - ADD_SUBDIRECTORY(examples/SmoothLOD) - ADD_SUBDIRECTORY(examples/DecodeOnGPU) - ADD_SUBDIRECTORY(examples/Python) - SET(BUILD_EXAMPLES ON) -ELSE() - SET(BUILD_EXAMPLES OFF) +SET(BUILD_EXAMPLES OFF) +IF(ENABLE_EXAMPLES) + ADD_SUBDIRECTORY(examples) ENDIF() INCLUDE(Packaging.cmake) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index e95ad41a..64356460 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,7 +1,14 @@ -ADD_SUBDIRECTORY(common) -ADD_SUBDIRECTORY(Basic) -ADD_SUBDIRECTORY(Paging) -ADD_SUBDIRECTORY(OpenGL) -ADD_SUBDIRECTORY(SmoothLOD) -ADD_SUBDIRECTORY(DecodeOnGPU) -ADD_SUBDIRECTORY(Python) +find_package(Qt5OpenGL 5.2) + +set_package_properties(Qt5OpenGL PROPERTIES DESCRIPTION "C++ framework" URL http://qt-project.org) +set_package_properties(Qt5OpenGL PROPERTIES TYPE RECOMMENDED PURPOSE "Building the examples") + +if(Qt5OpenGL_FOUND) + SET(BUILD_EXAMPLES ON PARENT_SCOPE) + ADD_SUBDIRECTORY(Basic) + ADD_SUBDIRECTORY(Paging) + ADD_SUBDIRECTORY(OpenGL) + ADD_SUBDIRECTORY(SmoothLOD) + ADD_SUBDIRECTORY(DecodeOnGPU) + ADD_SUBDIRECTORY(Python) +endif()