Fix build when CMocka isn't installed (#7129)
Vladimir Kobal committed
Oct 18, 2019 at 15:33 UTC
8f1ee072f151a1a553959af27b7ae42cff7b311b
3 files changed
+22
-17
CMakeLists.txt
+1
@@ -302,6 +302,7 @@ set(LIBNETDATA_FILES
302
libnetdata/inlined.h
303
libnetdata/libnetdata.c
304
libnetdata/libnetdata.h
305
+ libnetdata/required_dummies.h
306
libnetdata/locks/locks.c
307
libnetdata/locks/locks.h
308
libnetdata/log/log.c
Makefile.am
+18
-15
@@ -137,6 +137,7 @@ LIBNETDATA_FILES = \
137
libnetdata/inlined.h \
138
libnetdata/libnetdata.c \
139
libnetdata/libnetdata.h \
140
+ libnetdata/required_dummies.h \
141
libnetdata/locks/locks.c \
142
libnetdata/locks/locks.h \
143
libnetdata/log/log.c \
@@ -638,21 +639,23 @@ if ENABLE_BACKEND_MONGODB
639
netdata_LDADD += $(OPTIONAL_MONGOC_LIBS)
640
endif
641
641
-check_PROGRAMS = \
642
- libnetdata/tests/str2ld_testdriver \
643
- libnetdata/storage_number/tests/storage_number_testdriver \
644
- $(NULL)
642
+if ENABLE_UNITTESTS
643
+ check_PROGRAMS = \
644
+ libnetdata/tests/str2ld_testdriver \
645
+ libnetdata/storage_number/tests/storage_number_testdriver \
646
+ $(NULL)
647
646
-TESTS = $(check_PROGRAMS)
648
+ TESTS = $(check_PROGRAMS)
649
648
-libnetdata_tests_str2ld_testdriver_SOURCES = \
649
- libnetdata/tests/test_str2ld.c \
650
- $(LIBNETDATA_FILES) \
651
- $(NULL)
652
-libnetdata_tests_str2ld_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS)
650
+ libnetdata_tests_str2ld_testdriver_SOURCES = \
651
+ libnetdata/tests/test_str2ld.c \
652
+ $(LIBNETDATA_FILES) \
653
+ $(NULL)
654
+ libnetdata_tests_str2ld_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS)
655
654
-libnetdata_storage_number_tests_storage_number_testdriver_SOURCES = \
655
- libnetdata/storage_number/tests/test_storage_number.c \
656
- $(LIBNETDATA_FILES) \
657
- $(NULL)
658
-libnetdata_storage_number_tests_storage_number_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS)
656
+ libnetdata_storage_number_tests_storage_number_testdriver_SOURCES = \
657
+ libnetdata/storage_number/tests/test_storage_number.c \
658
+ $(LIBNETDATA_FILES) \
659
+ $(NULL)
660
+ libnetdata_storage_number_tests_storage_number_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS)
661
+endif
configure.ac
+3
-2
@@ -1142,9 +1142,10 @@ AC_ARG_ENABLE(
1142
)
1143
1144
PKG_CHECK_MODULES(
1145
- [CMOCKA], [cmocka],
1145
+ [CMOCKA],
1146
+ [cmocka],
1147
[have_cmocka="yes"],
1147
- [AC_MSG_WARN([cmocka.pc not found on the system. Unit tests disabled])]
1148
+ [AC_MSG_NOTICE([CMocka not found on the system. Unit tests disabled])]
1149
)
1150
AM_CONDITIONAL([ENABLE_UNITTESTS], [test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes" ])
1151
AC_SUBST([ENABLE_UNITTESTS])