From 1e09b823b76dcfd0d6c813ea275795d9e3420b6e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 14 May 2020 01:12:31 +0200 Subject: [PATCH] CMake: remove redundant testing configuration - BUILD_TESTING is built-in to CMake, and including CTest turns on all the machinery, so we don't have to do that ourselves. --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2c7dbe6d..18b9b116b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,6 @@ set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during develop option( INSTALL_CONFIG "Install configuration files" OFF ) option( INSTALL_POLKIT "Install Polkit configuration" ON ) option( INSTALL_COMPLETION "Install shell completions" OFF ) -option( BUILD_TESTING "Build the testing tree." ON ) option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." OFF ) option( WITH_KF5Crash "Enable crash reporting with KCrash." ON ) @@ -159,6 +158,7 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.10.0") ) endif() +include( CTest ) ### C++ SETUP # @@ -312,10 +312,6 @@ if( NOT KF5DBusAddons_FOUND ) set( WITH_KF5DBus OFF ) endif() -if( BUILD_TESTING ) - enable_testing() -endif () - find_package( PythonLibs ${PYTHONLIBS_VERSION} ) set_package_properties( PythonLibs PROPERTIES