From 3262599413e5928dad5ae87c78967560cc144527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 17 May 2015 14:58:10 +0200 Subject: [PATCH] core: make cpputest optional in cmake compilation With this fix, WeeChat can be built without tests (if cpputest is not found), without having to explicitely disable tests ("-DENABLE_TESTS=OFF"). --- CMakeLists.txt | 3 ++- cmake/FindCppUTest.cmake | 2 +- tests/CMakeLists.txt | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 358b3b4de..622690140 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,8 @@ endif() add_subdirectory(src) add_subdirectory(doc) -if(ENABLE_TESTS) +find_package(CppUTest) +if(ENABLE_TESTS AND CPPUTEST_FOUND) enable_testing() add_subdirectory(tests) endif() diff --git a/cmake/FindCppUTest.cmake b/cmake/FindCppUTest.cmake index 33740ddcb..67edd3d1c 100644 --- a/cmake/FindCppUTest.cmake +++ b/cmake/FindCppUTest.cmake @@ -33,5 +33,5 @@ endif() find_package(PkgConfig) if(PKG_CONFIG_FOUND) - pkg_search_module(CPPUTEST REQUIRED cpputest) + pkg_search_module(CPPUTEST cpputest) endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 66e2adb89..7356d6417 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,8 +19,6 @@ enable_language(CXX) -find_package(CppUTest REQUIRED) - # fake ncurses lib (it does nothing) set(LIB_WEECHAT_NCURSES_FAKE_SRC ncurses-fake.c) add_library(weechat_ncurses_fake STATIC ${LIB_WEECHAT_NCURSES_FAKE_SRC})