diff options
| author | Vladimir Kobal <vlad@prokk.net> | 2019-10-18 15:33:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 15:33:05 +0300 |
| commit | 8f1ee072f151a1a553959af27b7ae42cff7b311b (patch) | |
| tree | 531487ae0fd9b0aa3d02a0d82844f01e8eb842d4 | |
| parent | 2d2e3a1e1483bb8acf6d669b2e9e096af87d2eea (diff) | |
Fix build when CMocka isn't installed (#7129)
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Makefile.am | 33 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 22 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2039acf40a..857f5b9af9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,6 +302,7 @@ set(LIBNETDATA_FILES libnetdata/inlined.h libnetdata/libnetdata.c libnetdata/libnetdata.h + libnetdata/required_dummies.h libnetdata/locks/locks.c libnetdata/locks/locks.h libnetdata/log/log.c diff --git a/Makefile.am b/Makefile.am index a754bd26aa..d9da7b8a0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,6 +137,7 @@ LIBNETDATA_FILES = \ libnetdata/inlined.h \ libnetdata/libnetdata.c \ libnetdata/libnetdata.h \ + libnetdata/required_dummies.h \ libnetdata/locks/locks.c \ libnetdata/locks/locks.h \ libnetdata/log/log.c \ @@ -638,21 +639,23 @@ if ENABLE_BACKEND_MONGODB netdata_LDADD += $(OPTIONAL_MONGOC_LIBS) endif -check_PROGRAMS = \ - libnetdata/tests/str2ld_testdriver \ - libnetdata/storage_number/tests/storage_number_testdriver \ - $(NULL) +if ENABLE_UNITTESTS + check_PROGRAMS = \ + libnetdata/tests/str2ld_testdriver \ + libnetdata/storage_number/tests/storage_number_testdriver \ + $(NULL) -TESTS = $(check_PROGRAMS) + TESTS = $(check_PROGRAMS) -libnetdata_tests_str2ld_testdriver_SOURCES = \ - libnetdata/tests/test_str2ld.c \ - $(LIBNETDATA_FILES) \ - $(NULL) -libnetdata_tests_str2ld_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS) + libnetdata_tests_str2ld_testdriver_SOURCES = \ + libnetdata/tests/test_str2ld.c \ + $(LIBNETDATA_FILES) \ + $(NULL) + libnetdata_tests_str2ld_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS) -libnetdata_storage_number_tests_storage_number_testdriver_SOURCES = \ - libnetdata/storage_number/tests/test_storage_number.c \ - $(LIBNETDATA_FILES) \ - $(NULL) -libnetdata_storage_number_tests_storage_number_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS) + libnetdata_storage_number_tests_storage_number_testdriver_SOURCES = \ + libnetdata/storage_number/tests/test_storage_number.c \ + $(LIBNETDATA_FILES) \ + $(NULL) + libnetdata_storage_number_tests_storage_number_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS) +endif diff --git a/configure.ac b/configure.ac index c35639adc2..ea91a72991 100644 --- a/configure.ac +++ b/configure.ac @@ -1142,9 +1142,10 @@ AC_ARG_ENABLE( ) PKG_CHECK_MODULES( - [CMOCKA], [cmocka], + [CMOCKA], + [cmocka], [have_cmocka="yes"], - [AC_MSG_WARN([cmocka.pc not found on the system. Unit tests disabled])] + [AC_MSG_NOTICE([CMocka not found on the system. Unit tests disabled])] ) AM_CONDITIONAL([ENABLE_UNITTESTS], [test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes" ]) AC_SUBST([ENABLE_UNITTESTS]) |