treewide: remove BUILD_TESTING flag

This is now set by CMake
This commit is contained in:
Matthew Bauer 2019-02-21 20:51:58 -05:00
parent 91f0c848f4
commit 6ed49262f5
19 changed files with 9 additions and 30 deletions

View File

@ -12,10 +12,6 @@ stdenv.mkDerivation rec {
sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl"; sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl";
}; };
cmakeFlags = [
"-DBUILD_TESTING=OFF"
];
nativeBuildInputs = [ cmake extra-cmake-modules ]; nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ];

View File

@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
}; };
cmakeFlags = [ cmakeFlags = [
"-DBUILD_TESTING=OFF"
"-DPYTHON_EXECUTABLE=${python}/bin/python" "-DPYTHON_EXECUTABLE=${python}/bin/python"
]; ];

View File

@ -23,7 +23,6 @@ stdenv.mkDerivation {
"-DBUILD_BIOMESH3D=1" "-DBUILD_BIOMESH3D=1"
"-DWITH_TETGEN=1" "-DWITH_TETGEN=1"
"-DBUILD_TYPE=Release" "-DBUILD_TYPE=Release"
"-DBUILD_TESTING=0"
"-DWITH_WXWIDGETS=ON" "-DWITH_WXWIDGETS=ON"
"-DITK_DIR=${itk}/lib/InsightToolkit" "-DITK_DIR=${itk}/lib/InsightToolkit"
"-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a" "-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a"

View File

@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ itk vtk ]; buildInputs = [ itk vtk ];
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
# as cmake otherwise tries to download test data:
"-DBUILD_TESTING=FALSE" ];
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libminc ]; buildInputs = [ libminc ];
propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
# testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc
postFixup = '' postFixup = ''
@ -33,4 +33,3 @@ stdenv.mkDerivation rec {
license = licenses.free; license = licenses.free;
}; };
} }

View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ ]; buildInputs = [ ];
#cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" "-DBUILD_TESTING=FALSE" ]; #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ];
doCheck = false; doCheck = false;
# internal_volume_io.h: No such file or directory # internal_volume_io.h: No such file or directory

View File

@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ cmakeFlags = [ "-H.." ];
"-H.."
"-DBUILD_TESTING=OFF"];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";

View File

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=ON" "-DBUILD_STATIC_LIBS=ON"
"-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
]; ];
doCheck = false; doCheck = false;

View File

@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
}; };
cmakeFlags = [ cmakeFlags = [
"-DBUILD_TESTING=OFF"
"-DBUILD_EXAMPLES=OFF" "-DBUILD_EXAMPLES=OFF"
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DModule_ITKMINC=ON" "-DModule_ITKMINC=ON"

View File

@ -22,13 +22,12 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib netcdf nifticlib hdf5 ]; buildInputs = [ zlib netcdf nifticlib hdf5 ];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
"-DLIBMINC_MINC1_SUPPORT=ON" "-DLIBMINC_MINC1_SUPPORT=ON"
"-DLIBMINC_BUILD_SHARED_LIBS=ON" "-DLIBMINC_BUILD_SHARED_LIBS=ON"
"-DLIBMINC_USE_SYSTEM_NIFTI=ON" "-DLIBMINC_USE_SYSTEM_NIFTI=ON"
]; ];
doCheck = stdenv.buildPlatform == stdenv.hostPlatform; doCheck = true;
checkPhase = '' checkPhase = ''
export LD_LIBRARY_PATH="$(pwd)" # see #22060 export LD_LIBRARY_PATH="$(pwd)" # see #22060
ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure

View File

@ -19,7 +19,6 @@ let
cmakeFlags = cmakeFlags =
(args.cmakeFlags or []) (args.cmakeFlags or [])
++ [ ++ [
"-DBUILD_TESTING=OFF"
("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release")) ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release"))
]; ];

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libminc netpbm ]; buildInputs = [ libminc netpbm ];
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBUILD_TESTING=FALSE" ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" ];
doCheck = false; doCheck = false;
# internal_volume_io.h: No such file or directory # internal_volume_io.h: No such file or directory

View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON"; cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON";
doCheck = true; doCheck = true;

View File

@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
# objects. # objects.
cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF" ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
# BUILD_OUL wants old linux headers for videodev.h, not available # BUILD_OUL wants old linux headers for videodev.h, not available
# in stdenv linux headers # in stdenv linux headers
# BUILD_BRL fails to find open() # BUILD_BRL fails to find open()
cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF " cmakeFlags = "-DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF "
+ (if stdenv.hostPlatform.system == "x86_64-linux" then + (if stdenv.hostPlatform.system == "x86_64-linux" then
"-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
else else

View File

@ -10,7 +10,6 @@ let components = {
hpmc = true; hpmc = true;
md = true; md = true;
metal = true; metal = true;
testing = false;
}; };
onOffBool = b: if b then "ON" else "OFF"; onOffBool = b: if b then "ON" else "OFF";
withMPI = (mpi != null); withMPI = (mpi != null);
@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
"-DBUILD_HPMC=${onOffBool components.hpmc}" "-DBUILD_HPMC=${onOffBool components.hpmc}"
"-DBUILD_MD=${onOffBool components.md}" "-DBUILD_MD=${onOffBool components.md}"
"-DBUILD_METAL=${onOffBool components.metal}" "-DBUILD_METAL=${onOffBool components.metal}"
"-DBUILD_TESTING=${onOffBool components.testing}"
]; ];
preConfigure = '' preConfigure = ''

View File

@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DCRYFS_UPDATE_CHECKS=OFF" "-DCRYFS_UPDATE_CHECKS=OFF"
"-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive
"-DBUILD_TESTING=ON"
]; ];
doCheck = true; doCheck = true;

View File

@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DBUILD_TESTING=ON"
"-DHDF4_BUILD_TOOLS=ON" "-DHDF4_BUILD_TOOLS=ON"
"-DHDF4_BUILD_UTILS=ON" "-DHDF4_BUILD_UTILS=ON"
"-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF"

View File

@ -87,7 +87,6 @@ in stdenv.mkDerivation rec {
"-DUSE_SYSTEM_LIBARCHIVE=ON" "-DUSE_SYSTEM_LIBARCHIVE=ON"
"-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_GTEST=ON"
"-DUSE_SYSTEM_MKSQUASHFS=ON" "-DUSE_SYSTEM_MKSQUASHFS=ON"
"-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
]; ];
checkInputs = [ gtest ]; checkInputs = [ gtest ];