瀏覽代碼

Merge branch 'remove-cmake-warnings'

* remove-cmake-warnings:
  Configure external project using BUILD_TESTING option only if required
Jean-Christophe Fillion-Robin 14 年之前
父節點
當前提交
2681ae4616

+ 1 - 0
CMakeExternals/DCMTK.cmake

@@ -31,6 +31,7 @@ IF(${add_project})
       BUILD_COMMAND ""
       CMAKE_ARGS
         ${ep_common_args}
+        -DBUILD_TESTING:BOOL=OFF
         -DDCMTK_BUILD_APPS:BOOL=ON # Build also dmctk tools (movescu, storescp, ...)
       )
     SET(DCMTK_DIR ${ep_install_dir})

+ 1 - 0
CMakeExternals/ITK.cmake

@@ -28,6 +28,7 @@ IF(${add_project})
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
+        -DBUILD_TESTING:BOOL=OFF
         -DBUILD_EXAMPLES:BOOL=OFF
         -DBUILD_SHARED_LIBS:BOOL=ON
         -DITK_USE_REVIEW:BOOL=ON

+ 1 - 0
CMakeExternals/KWStyle.cmake

@@ -25,6 +25,7 @@ IF(CTK_USE_KWSTYLE)
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
+        -DBUILD_TESTING:BOOL=OFF
       DEPENDS
         ${proj_DEPENDENCIES}
       )

+ 1 - 0
CMakeExternals/VTK.cmake

@@ -41,6 +41,7 @@ IF(${add_project} OR CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_VTK)
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
+        -DBUILD_TESTING:BOOL=OFF
         ${additional_vtk_cmakevars}
         -DVTK_WRAP_TCL:BOOL=OFF
         -DVTK_USE_TK:BOOL=OFF

+ 1 - 0
CMakeExternals/XIP.cmake

@@ -28,6 +28,7 @@ IF(${add_project})
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
+        -DBUILD_TESTING:BOOL=OFF
         -DHAS_VTK:BOOL=OFF
         -DHAS_ITK:BOOL=OFF
       )

+ 7 - 6
CMakeExternals/ZMQ.cmake

@@ -29,14 +29,15 @@ IF(${add_project})
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
-		    -DBUILD_SHARED_LIBS:BOOL=ON 
-		    -DZMQ_BUILD_DEVICES:BOOL=ON
-		    -DZMQ_BUILD_PERFORMANCE_TESTS:BOOL=ON
-		  DEPENDS
-		    ${proj_DEPENDENCIES}
+        -DBUILD_TESTING:BOOL=OFF
+        -DBUILD_SHARED_LIBS:BOOL=ON 
+        -DZMQ_BUILD_DEVICES:BOOL=ON
+        -DZMQ_BUILD_PERFORMANCE_TESTS:BOOL=ON
+       DEPENDS
+        ${proj_DEPENDENCIES}
       )
     SET(ZMQ_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
-	
+
   ELSE()
     ctkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
   ENDIF()

+ 0 - 1
SuperBuild.cmake

@@ -85,7 +85,6 @@ SET(ep_build_testing OFF)
 SET(ep_common_args
   -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
   -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-  -DBUILD_TESTING:BOOL=${ep_build_testing}
   )
 
 # Compute -G arg for configuring external projects with the same CMake generator: