diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-16 21:13:42 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-16 21:13:42 (GMT) |
| commit | a5d5d21dfbe1e6c847a32b73c90106df2a3442de (patch) | |
| tree | 6339e7d9a1ae4b6de9d77dd72291a0bcea88024c | |
| parent | 4159e9dc5f140c659725f97a5f5cd284a47affd5 (diff) | |
| parent | f4ee7e90d8a4f917ccdf19b732377f37579dab53 (diff) | |
Merge remote-tracking branch 'origin/visitortests' into visitortests
| -rw-r--r-- | tests/CMakeLists.txt | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c4d1b7f..d3abff2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,9 @@ cmake_minimum_required(VERSION 2.8) -# Explicitly use new include policy to avoid globally shadowing included modules -# http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0017 -cmake_policy(SET CMP0017 NEW) +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" GREATER 2.8.3) + # Explicitly use new include policy to avoid globally shadowing included modules + # http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0017 + cmake_policy(SET CMP0017 NEW) +endif() project(tests) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") @@ -191,18 +193,6 @@ add_executable(echotest echotest.cc ${CORE_SOURCES}) target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY}) # -# echotest -# -add_executable(echotest echotest.cc ${CORE_SOURCES}) -target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY}) - -# -# echotest -# -add_executable(echotest echotest.cc ${CORE_SOURCES}) -target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY}) - -# # Offscreen OpenGL context source code # if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |