Add a status message at the end of the CMake run.
Move the ADD_DEPENDENCIES() call inside the conditional.
This commit is contained in:
parent
0db01213a7
commit
04b93b18f6
@ -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
|
OPTION(ENABLE_CPP0X "Does the compiler support C++0x" OFF) #Enable with -DENABLE_CPP0X=ON or in the GUI
|
||||||
IF(ENABLE_CPP0X)
|
IF(ENABLE_CPP0X)
|
||||||
MESSAGE(STATUS "Compiling in C++0x mode")
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW"
|
IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW"
|
||||||
ADD_DEFINITIONS(-DC_PLUS_PLUS_ZERO_X_SUPPORTED -std=c++0x) #Will only work on GCC
|
ADD_DEFINITIONS(-DC_PLUS_PLUS_ZERO_X_SUPPORTED -std=c++0x) #Will only work on GCC
|
||||||
ELSEIF(MSYS)
|
ELSEIF(MSYS)
|
||||||
@ -22,13 +21,21 @@ ADD_SUBDIRECTORY(library)
|
|||||||
OPTION(ENABLE_EXAMPLES "Should the examples be built" ON)
|
OPTION(ENABLE_EXAMPLES "Should the examples be built" ON)
|
||||||
IF(ENABLE_EXAMPLES)
|
IF(ENABLE_EXAMPLES)
|
||||||
ADD_SUBDIRECTORY(examples/OpenGL)
|
ADD_SUBDIRECTORY(examples/OpenGL)
|
||||||
|
ADD_DEPENDENCIES(OpenGLExample PolyVoxCore PolyVoxUtil)
|
||||||
ENDIF(ENABLE_EXAMPLES)
|
ENDIF(ENABLE_EXAMPLES)
|
||||||
|
|
||||||
ADD_DEPENDENCIES(OpenGLExample PolyVoxCore PolyVoxUtil)
|
|
||||||
|
|
||||||
INCLUDE(Packaging.cmake)
|
INCLUDE(Packaging.cmake)
|
||||||
|
|
||||||
INCLUDE(CTest)
|
INCLUDE(CTest)
|
||||||
IF(BUILD_TESTING)
|
IF(BUILD_TESTING)
|
||||||
ADD_SUBDIRECTORY(tests)
|
ADD_SUBDIRECTORY(tests)
|
||||||
ENDIF(BUILD_TESTING)
|
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 "")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user