From 04b93b18f67e4b7c974551f9f5a26fa714010aef Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Tue, 2 Mar 2010 16:12:25 +0000 Subject: [PATCH] Add a status message at the end of the CMake run. Move the ADD_DEPENDENCIES() call inside the conditional. --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3564c80a..ce1dee5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,6 @@ SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX OPTION(ENABLE_CPP0X "Does the compiler support C++0x" OFF) #Enable with -DENABLE_CPP0X=ON or in the GUI IF(ENABLE_CPP0X) - MESSAGE(STATUS "Compiling in C++0x mode") IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW" ADD_DEFINITIONS(-DC_PLUS_PLUS_ZERO_X_SUPPORTED -std=c++0x) #Will only work on GCC ELSEIF(MSYS) @@ -22,13 +21,21 @@ ADD_SUBDIRECTORY(library) OPTION(ENABLE_EXAMPLES "Should the examples be built" ON) IF(ENABLE_EXAMPLES) ADD_SUBDIRECTORY(examples/OpenGL) + ADD_DEPENDENCIES(OpenGLExample PolyVoxCore PolyVoxUtil) ENDIF(ENABLE_EXAMPLES) -ADD_DEPENDENCIES(OpenGLExample PolyVoxCore PolyVoxUtil) - INCLUDE(Packaging.cmake) INCLUDE(CTest) IF(BUILD_TESTING) ADD_SUBDIRECTORY(tests) ENDIF(BUILD_TESTING) + +# Option summary +MESSAGE(STATUS "") +MESSAGE(STATUS "Summary") +MESSAGE(STATUS "-------") +MESSAGE(STATUS "C++0x mode: " ${ENABLE_CPP0X}) +MESSAGE(STATUS "Build examples: " ${ENABLE_EXAMPLES}) +MESSAGE(STATUS "Build tests: " ${BUILD_TESTING}) +MESSAGE(STATUS "")