Commit cebdaf72 authored by jcfr's avatar jcfr
Browse files

STYLE: Use BUILD_TESTING variable

Change occurrences of Slicer_BUILD_TESTING into BUILD_TESTING

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15170 3bd1e089-480b-0410-8dfb-8563597acbee
parent 1a74ba0f
...@@ -12,6 +12,6 @@ IF(Slicer_USE_QT) ...@@ -12,6 +12,6 @@ IF(Slicer_USE_QT)
ADD_SUBDIRECTORY(SlicerQT) ADD_SUBDIRECTORY(SlicerQT)
ENDIF(Slicer_USE_QT) ENDIF(Slicer_USE_QT)
IF(Slicer_BUILD_TESTING) IF(BUILD_TESTING)
ADD_SUBDIRECTORY(Testing) ADD_SUBDIRECTORY(Testing)
ENDIF(Slicer_BUILD_TESTING) ENDIF(BUILD_TESTING)
...@@ -291,6 +291,6 @@ generateclp(${SRC} Slicer3.xml) ...@@ -291,6 +291,6 @@ generateclp(${SRC} Slicer3.xml)
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Testing # Testing
# #
IF(Slicer_BUILD_TESTING) IF(BUILD_TESTING)
ADD_SUBDIRECTORY(Testing) ADD_SUBDIRECTORY(Testing)
ENDIF(Slicer_BUILD_TESTING) ENDIF(BUILD_TESTING)
...@@ -504,6 +504,6 @@ INSTALL(TARGETS SlicerQT${SlicerQT_EXE_SUFFIX} ...@@ -504,6 +504,6 @@ INSTALL(TARGETS SlicerQT${SlicerQT_EXE_SUFFIX}
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Testing # Testing
# #
IF(Slicer_BUILD_TESTING) IF(BUILD_TESTING)
ADD_SUBDIRECTORY(Testing) ADD_SUBDIRECTORY(Testing)
ENDIF(Slicer_BUILD_TESTING) ENDIF(BUILD_TESTING)
...@@ -37,8 +37,8 @@ Slicer_compile_python_scripts( ...@@ -37,8 +37,8 @@ Slicer_compile_python_scripts(
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Testing # Testing
# #
if(Slicer_BUILD_TESTING) if(BUILD_TESTING)
IF(Slicer_USE_PYTHONQT_WITH_TCL) IF(Slicer_USE_PYTHONQT_WITH_TCL)
add_subdirectory(tpycl/Testing) add_subdirectory(tpycl/Testing)
ENDIF() ENDIF()
endif(Slicer_BUILD_TESTING) endif(BUILD_TESTING)
...@@ -30,7 +30,7 @@ MACRO(SLICER_SETUP_QT) ...@@ -30,7 +30,7 @@ MACRO(SLICER_SETUP_QT)
ENDIF() ENDIF()
# Enable modules # Enable modules
SET(QT_USE_QTNETWORK ON) SET(QT_USE_QTNETWORK ON)
SET(QT_USE_QTTEST ${Slicer_BUILD_TESTING}) SET(QT_USE_QTTEST ${BUILD_TESTING})
# Includes Qt headers # Includes Qt headers
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
......
...@@ -208,17 +208,11 @@ INCLUDE(${Slicer_CMAKE_DIR}/DiscoverSystemNameAndBits.cmake) ...@@ -208,17 +208,11 @@ INCLUDE(${Slicer_CMAKE_DIR}/DiscoverSystemNameAndBits.cmake)
MESSAGE(STATUS "Slicer_BUILD:${Slicer_BUILD}") MESSAGE(STATUS "Slicer_BUILD:${Slicer_BUILD}")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add the testing directories # Testing
# #
OPTION(BUILD_TESTING "Test the project" ON) OPTION(BUILD_TESTING "Test the project" ON)
SET(Slicer_BUILD_TESTING ${BUILD_TESTING})
SET(LAUNCH_EXE ${Slicer_BINARY_DIR}/Slicer3 --launch) SET(LAUNCH_EXE ${Slicer_BINARY_DIR}/Slicer3 --launch)
IF(Slicer_BUILD_TESTING) IF(BUILD_TESTING)
#IF(NOT BUILDNAME)
# SET(BUILDNAME "${Slicer_BUILD}" CACHE STRING "Name of build on the dashboard")
#ELSE()
# SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
#ENDIF()
ENABLE_TESTING() ENABLE_TESTING()
INCLUDE(CTest) INCLUDE(CTest)
SET(CXX_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) SET(CXX_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
...@@ -739,7 +733,7 @@ add_subdirectory(Applications) ...@@ -739,7 +733,7 @@ add_subdirectory(Applications)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Testing # Testing
# #
IF(Slicer_BUILD_TESTING) IF(BUILD_TESTING)
add_subdirectory(Testing) add_subdirectory(Testing)
ENDIF() ENDIF()
......
...@@ -142,7 +142,7 @@ ENDFOREACH(module) ...@@ -142,7 +142,7 @@ ENDFOREACH(module)
## COMMANDLINE_DEBUG ## COMMANDLINE_DEBUG
## DEAMON_DEBUG ## DEAMON_DEBUG
if(Slicer_BUILD_TESTING) if(BUILD_TESTING)
ADD_SUBDIRECTORY(Testing) ADD_SUBDIRECTORY(Testing)
endif(Slicer_BUILD_TESTING) endif(BUILD_TESTING)
...@@ -56,6 +56,6 @@ ENDFOREACH(lib) ...@@ -56,6 +56,6 @@ ENDFOREACH(lib)
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
if(Slicer_BUILD_TESTING) if(BUILD_TESTING)
ADD_SUBDIRECTORY(Testing) ADD_SUBDIRECTORY(Testing)
endif(Slicer_BUILD_TESTING) endif(BUILD_TESTING)
...@@ -85,9 +85,9 @@ include("${VTK_CMAKE_DIR}/vtkWrapTcl.cmake") ...@@ -85,9 +85,9 @@ include("${VTK_CMAKE_DIR}/vtkWrapTcl.cmake")
vtk_wrap_tcl3(NeuroNav NeuroNav_TCL_SRCS "${NeuroNav_SRCS}" "") vtk_wrap_tcl3(NeuroNav NeuroNav_TCL_SRCS "${NeuroNav_SRCS}" "")
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
if(Slicer_BUILD_TESTING) if(BUILD_TESTING)
ADD_SUBDIRECTORY(Testing) ADD_SUBDIRECTORY(Testing)
endif(Slicer_BUILD_TESTING) endif(BUILD_TESTING)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
......
...@@ -2,6 +2,6 @@ project(Statistics) ...@@ -2,6 +2,6 @@ project(Statistics)
ADD_SUBDIRECTORY(LabelStatistics) ADD_SUBDIRECTORY(LabelStatistics)
if(Slicer_BUILD_TESTING) if(BUILD_TESTING)
ADD_SUBDIRECTORY(Testing) ADD_SUBDIRECTORY(Testing)
endif(Slicer_BUILD_TESTING) endif(BUILD_TESTING)
...@@ -53,9 +53,9 @@ FOREACH(lib ${Tractography_libs}) ...@@ -53,9 +53,9 @@ FOREACH(lib ${Tractography_libs})
ENDFOREACH(lib) ENDFOREACH(lib)
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
if(Slicer_BUILD_TESTING) if(BUILD_TESTING)
ADD_SUBDIRECTORY(Testing) ADD_SUBDIRECTORY(Testing)
endif(Slicer_BUILD_TESTING) endif(BUILD_TESTING)
# Install testing data # Install testing data
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment