ENH: Slicer requires special treatment.

matsuij · Nov 14, 2012 · 4dfc440 · 4dfc440
1 parent 54995e8
commit 4dfc440
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 20 deletions.
diff --git a/AutoWorkup/CMakeLists.txt b/AutoWorkup/CMakeLists.txt
@@ -3,6 +3,6 @@
 #-----------------------------------------------------------------------------
 # Output directories.
 #
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
     add_subdirectory(TestSuite)
 endif()
diff --git a/BRAINSABC/CMakeLists.txt b/BRAINSABC/CMakeLists.txt
@@ -6,7 +6,7 @@
 ###
 add_subdirectory(brainseg)
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   add_subdirectory(TestSuite)
 endif()
 
diff --git a/BRAINSCommonLib/CMakeLists.txt b/BRAINSCommonLib/CMakeLists.txt
@@ -77,7 +77,7 @@ install(FILES ${TESTFILES_TO_INSTALL}
 
 ##HACK NEED BETTER TESTS add_directory( TestLargestForegroundFilledMaskImageFilter )
 ##HACK NEED BETTER TESTS add_directory( Test_FindCenterOfBrainFilter )
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   add_subdirectory(TestSuite)
 endif()
 
diff --git a/BRAINSConstellationDetector/CMakeLists.txt b/BRAINSConstellationDetector/CMakeLists.txt
@@ -14,7 +14,7 @@ if(BUILD_WITH_GUI OR BRAINS3_USE_QT OR BRAINSTools_USE_QT)
 endif()
 
 # Build test option
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   add_subdirectory(TestSuite)
 endif()
 
diff --git a/BRAINSContinuousClass/CMakeLists.txt b/BRAINSContinuousClass/CMakeLists.txt
@@ -11,7 +11,7 @@ foreach(prog ${ALL_PROGS_LIST})
 endforeach()
 
 ### Add the Testing Subdirectory.
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   add_subdirectory(TestSuite)
 endif()
 
diff --git a/BRAINSCut/CMakeLists.txt b/BRAINSCut/CMakeLists.txt
@@ -58,7 +58,7 @@ if(1) ## HACK Regina many tests are failing and needs investigation,
       ## HACK Regina some tests are segmentation faulting
   add_subdirectory(TestSuite)
 endif()
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   add_executable(TestHashKey TestHashKey.cxx)
   target_link_libraries(TestHashKey BRAINSCutCOMMONLIB)
 endif()
diff --git a/BRAINSDemonWarp/CMakeLists.txt b/BRAINSDemonWarp/CMakeLists.txt
@@ -50,6 +50,6 @@ foreach(prog ${ALL_PROGS_LIST})
 endforeach()
 
 ### Add the Testing Subdirectory.
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   add_subdirectory(TestSuite)
 endif()
diff --git a/BRAINSFit/CMakeLists.txt b/BRAINSFit/CMakeLists.txt
@@ -19,6 +19,6 @@ foreach(prog ${ALL_PROGS_LIST})
   StandardBRAINSBuildMacro(NAME ${prog} TARGET_LIBRARIES ${BRAINSFitLibraries})
 endforeach()
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
     add_subdirectory(TestSuite)
 endif()
diff --git a/BRAINSImageConvert/BRAINSPosteriorToContinuousClass/CMakeLists.txt b/BRAINSImageConvert/BRAINSPosteriorToContinuousClass/CMakeLists.txt
@@ -3,6 +3,6 @@ StandardBRAINSBuildMacro(NAME BRAINSPosteriorToContinuousClass
 TARGET_LIBRARIES ${ITK_LIBRARIES})
 #CLI_XML_FILE BRAINSPosteriorToContinuousClass.xml)
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   add_subdirectory(TestSuite)
 endif()
diff --git a/BRAINSLandmarkInitializer/CMakeLists.txt b/BRAINSLandmarkInitializer/CMakeLists.txt
@@ -10,6 +10,6 @@ foreach(prog ${ALL_PROGS_LIST})
   StandardBRAINSBuildMacro(NAME ${prog} TARGET_LIBRARIES BRAINSCommonLib )
 endforeach()
 
-#if(BUILD_TESTING)
+#if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
 #    add_subdirectory(TestSuite)
 #endif()
diff --git a/BRAINSMultiModeSegment/CMakeLists.txt b/BRAINSMultiModeSegment/CMakeLists.txt
@@ -10,6 +10,6 @@ foreach(prog ${ALL_PROGS_LIST})
   StandardBRAINSBuildMacro(NAME ${prog} TARGET_LIBRARIES BRAINSCommonLib )
 endforeach()
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   #  add_subdirectory(TestSuite)
 endif()
diff --git a/BRAINSMush/CMakeLists.txt b/BRAINSMush/CMakeLists.txt
@@ -11,7 +11,7 @@ foreach(prog ${ALL_PROGS_LIST})
 endforeach()
 
 if(0)
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
     add_subdirectory(TestSuite)
 endif()
 endif()
diff --git a/BRAINSROIAuto/CMakeLists.txt b/BRAINSROIAuto/CMakeLists.txt
@@ -16,6 +16,6 @@ foreach(prog ${ALL_PROGS_LIST})
   StandardBRAINSBuildMacro(NAME ${prog} TARGET_LIBRARIES BRAINSCommonLib )
 endforeach()
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
     add_subdirectory(TestSuite)
 endif()
diff --git a/BRAINSResample/CMakeLists.txt b/BRAINSResample/CMakeLists.txt
@@ -17,6 +17,6 @@ foreach(prog ${ALL_PROGS_LIST})
 endforeach()
 
 ### Add the Testing Subdirectory.
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   add_subdirectory(TestSuite)
 endif()
diff --git a/BRAINSSnapShotWriter/CMakeLists.txt b/BRAINSSnapShotWriter/CMakeLists.txt
@@ -10,6 +10,6 @@ foreach(prog ${ALL_PROGS_LIST})
   StandardBRAINSBuildMacro(NAME ${prog} TARGET_LIBRARIES BRAINSCommonLib )
 endforeach()
 
-#if(BUILD_TESTING)
+#if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
 #    add_subdirectory(TestSuite)
 #endif()
diff --git a/BRAINSSurfaceTools/BRAINSSurfaceRegister/CMakeLists.txt b/BRAINSSurfaceTools/BRAINSSurfaceRegister/CMakeLists.txt
@@ -19,6 +19,6 @@ add_subdirectory( ProbabilityLabels )
 add_subdirectory( ResampleQuadEdgeMesh )
 add_subdirectory( QuadEdgeMeshSimilarity )
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
     add_subdirectory(TestSuite)
 endif()
diff --git a/BRAINSTransformConvert/CMakeLists.txt b/BRAINSTransformConvert/CMakeLists.txt
@@ -11,6 +11,6 @@ foreach(prog ${ALL_PROGS_LIST})
   StandardBRAINSBuildMacro(NAME ${prog} TARGET_LIBRARIES BRAINSCommonLib )
 endforeach()
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
     add_subdirectory(TestSuite)
 endif()
diff --git a/Common.cmake b/Common.cmake
@@ -49,7 +49,9 @@ option(USE_BRAINSCut                      "Build BRAINSCut"
 option(USE_BRAINSLandmarkInitializer      "Build BRAINSLandmarkInitializer"      ON)
 option(USE_ImageCalculator                "Build ImageCalculator"                ON)
 option(USE_BRAINSSnapShotWriter           "Build BRAINSSnapShotWriter"           ON)
+if( NOT USE_ANTS )
 option(USE_ANTS                           "Build ANTS"                           ON)
+endif()
 
 ## These are not yet ready for prime time.
 option(USE_BRAINSContinuousClass          "Build BRAINSContinuousClass "   OFF)

diff --git a/ICCDEF/CMakeLists.txt b/ICCDEF/CMakeLists.txt
@@ -51,6 +51,6 @@ foreach(prog ${ALL_PROGS_LIST})
   StandardBRAINSBuildMacro(NAME ${prog} TARGET_LIBRARIES ${ICCDEFLibraries})
 endforeach()
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   add_subdirectory(TestSuite)
 endif()
diff --git a/ImageCalculator/CMakeLists.txt b/ImageCalculator/CMakeLists.txt
@@ -10,7 +10,7 @@ target_link_libraries(ImageCalculator ${ITK_LIBRARIES} )
 add_executable(ImageGenerate ImageGenerate.cxx )
 target_link_libraries(ImageGenerate ${ITK_LIBRARIES})
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
 
   add_executable(ImageCalculatorTests
     ImageCalculatorTests.cxx ImageCalculatorUtils.cxx

diff --git a/SuperBuild.cmake b/SuperBuild.cmake
@@ -313,7 +313,7 @@ endif()
 #-----------------------------------------------------------------------------
 # CTestCustom
 #-----------------------------------------------------------------------------
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT Slicer_BUILD_BRAINSTOOLS)
   configure_file(
     CMake/CTestCustom.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake