[CMake,DEB,RPM] Remove CppUnit code from build system

Fixes: xrootd#2051
amadio · Mar 8, 2024 · 71c9abf · 71c9abf
1 parent 6680aa3
commit 71c9abf
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 41 deletions.
diff --git a/cmake/FindCppUnit.cmake b/cmake/FindCppUnit.cmake
diff --git a/cmake/XRootDFindLibs.cmake b/cmake/XRootDFindLibs.cmake
@@ -72,13 +72,11 @@ endif()
 
 if( ENABLE_TESTS )
   if( FORCE_ENABLED )
-    find_package( CppUnit REQUIRED )
     find_package( GTest REQUIRED )
   else()
-    find_package( CppUnit )
     find_package( GTest )
   endif()
-  if( CPPUNIT_FOUND AND GTEST_FOUND )
+  if( GTEST_FOUND )
     set( BUILD_TESTS TRUE )
   else()
     set( BUILD_TESTS FALSE )

diff --git a/cmake/XRootDSummary.cmake b/cmake/XRootDSummary.cmake
@@ -10,7 +10,7 @@ component_status( MACAROONS BUILD_MACAROONS   MACAROONS_FOUND AND JSON_FOUND AND
 component_status( PYTHON    BUILD_PYTHON      Python_Interpreter_FOUND AND Python_Development_FOUND )
 component_status( READLINE  ENABLE_READLINE   READLINE_FOUND )
 component_status( SCITOKENS BUILD_SCITOKENS   SCITOKENSCPP_FOUND )
-component_status( TESTS     BUILD_TESTS       CPPUNIT_FOUND AND GTEST_FOUND )
+component_status( TESTS     BUILD_TESTS       GTEST_FOUND )
 component_status( TPC       BUILD_TPC         CURL_FOUND )
 component_status( VOMSXRD   BUILD_VOMS        VOMS_FOUND )
 component_status( XRDCL     ENABLE_XRDCL      TRUE_VAR )

diff --git a/debian/control b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
  attr,
  cmake,
  libgtest-dev,
- libcppunit-dev,
  libisal-dev,
  pkg-config,
  libfuse-dev [linux-any kfreebsd-any],

diff --git a/xrootd.spec b/xrootd.spec
@@ -47,11 +47,6 @@ Source1:	%{url}/download/v%{compat_version}/%{name}-%{compat_version}.tar.gz
 %undefine __cmake3_in_source_build
 %endif
 
-%if %{with tests}
-# CppUnit crashes with LTO enabled
-%global _lto_cflags %nil
-%endif
-
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires:	cmake3
 BuildRequires:	%{devtoolset}-toolchain
@@ -134,7 +129,6 @@ BuildRequires:	openssl-devel
 
 %if %{with tests}
 BuildRequires:	attr
-BuildRequires:	cppunit-devel
 BuildRequires:	gtest-devel
 BuildRequires:	openssl
 %endif