summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Ibanez <luis.ibanez@gmail.com>2010-05-26 23:16:15 +0000
committerLuis Ibanez <luis.ibanez@gmail.com>2010-05-26 23:16:15 +0000
commit40c092bbc3c9ed38c1b15b71af49f6236181d7ee (patch)
treef6536cff702aca49e3d564b3560a3f7664298301
parent576f380ebad1459372892d2d63866f76325552ae (diff)
ENH: Enabling the lines that configure testing for the Dashboard.
-rw-r--r--CMakeLists.txt22
1 files changed, 13 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ff36452..38928452 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,10 @@ ENDIF(NOT OPENJPEG_NAMESPACE)
# In all cases:
STRING(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
+IF(COMMAND CMAKE_POLICY)
+ CMAKE_POLICY(SET CMP0003 NEW)
+ENDIF(COMMAND CMAKE_POLICY)
+
PROJECT(${OPENJPEG_NAMESPACE} C)
# Do full dependency headers.
@@ -107,15 +111,15 @@ ENDIF(BUILD_DOCUMENTATION)
#-----------------------------------------------------------------------------
# For openjpeg team if they ever want Dart+CMake
-#IF(OPENJPEG_STANDALONE)
-# INCLUDE(Dart)
-# MARK_AS_ADVANCED(BUILD_TESTING DART_ROOT TCL_TCLSH)
-# IF(BUILD_TESTING)
-# ENABLE_TESTING()
-# SET(BUILDNAME "OpenJPEG-${CMAKE_SYSTEM}-${CMAKE_C_COMPILER}" CACHE STRING "Name of build on the dashboard")
-# MARK_AS_ADVANCED(BUILDNAME)
-# ENDIF(BUILD_TESTING)
-#ENDIF(OPENJPEG_STANDALONE)
+IF(OPENJPEG_STANDALONE)
+ INCLUDE(CTest)
+ #MARK_AS_ADVANCED(BUILD_TESTING DART_ROOT TCL_TCLSH)
+ IF(BUILD_TESTING)
+ ENABLE_TESTING()
+ SET(BUILDNAME "OpenJPEG-${CMAKE_SYSTEM}-${CMAKE_C_COMPILER}" CACHE STRING "Name of build on the dashboard")
+ MARK_AS_ADVANCED(BUILDNAME)
+ ENDIF(BUILD_TESTING)
+ENDIF(OPENJPEG_STANDALONE)
# Adding test with dataset from:
# http://www.crc.ricoh.com/~gormish/jpeg2000conformance/