@cryptotaxi247 / netdata-1 / commits / 646270581

re-organize cmake building to debug under clion

Costa Tsaousis (ktsaou) committed Sep 24, 2017 at 00:23 UTC 6462705815d59a5ae4d582aece68be7a9a94aa42
2 files changed +79 -54
CMakeLists.txt
+75 -52
@@ -7,15 +7,71 @@ project(netdata C)
7
8 find_package (Threads)
9
10 -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat-signedness -Werror=format-security -DNETDATA_INTERNAL_CHECKS=1")
10 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat-signedness -Werror=format-security -DNETDATA_INTERNAL_CHECKS=1 -fstack-protector-all")
11
12 -set(NETDATA_SOURCE_FILES
12 +set(NETDATA_FREEBSD_FILES
13 + src/plugin_freebsd.c
14 + src/plugin_freebsd.h
15 + src/freebsd_sysctl.c
16 + src/freebsd_getmntinfo.c
17 + src/freebsd_getifaddrs.c
18 + src/freebsd_devstat.c
19 + src/zfs_common.c
20 + src/zfs_common.h
21 + src/freebsd_kstat_zfs.c
22 + src/freebsd_ipfw.c
23 + )
24 +
25 +set(NETDATA_MACOS_FILES
26 + src/plugin_macos.c
27 + src/plugin_macos.h
28 + src/macos_sysctl.c
29 + src/macos_mach_smi.c
30 + src/macos_fw.c
31 + )
32 +
33 +set(NETDATA_LINUX_FILES
34 + src/ipc.c
35 + src/ipc.h
36 + src/plugin_proc.c
37 + src/plugin_proc.h
38 + src/plugin_proc_diskspace.c
39 + src/plugin_proc_diskspace.h
40 + src/proc_diskstats.c
41 + src/proc_interrupts.c
42 + src/proc_softirqs.c
43 + src/proc_loadavg.c
44 + src/proc_meminfo.c
45 + src/proc_net_dev.c
46 + src/proc_net_ip_vs_stats.c
47 + src/proc_net_netstat.c
48 + src/proc_net_rpc_nfs.c
49 + src/proc_net_rpc_nfsd.c
50 + src/proc_net_snmp.c
51 + src/proc_net_snmp6.c
52 + src/proc_net_softnet_stat.c
53 + src/proc_net_stat_conntrack.c
54 + src/proc_net_stat_synproxy.c
55 + src/zfs_common.c
56 + src/zfs_common.h
57 + src/proc_spl_kstat_zfs.c
58 + src/proc_stat.c
59 + src/proc_sys_kernel_random_entropy_avail.c
60 + src/proc_vmstat.c
61 + src/proc_uptime.c
62 + src/sys_kernel_mm_ksm.c
63 + src/sys_fs_cgroup.c
64 + )
65 +
66 +set(NETDATA_COMMON_FILES
67 src/adaptive_resortable_list.c
68 src/adaptive_resortable_list.h
69 src/appconfig.c
70 src/appconfig.h
71 src/avl.c
72 src/avl.h
73 + src/backend_prometheus.c
74 + src/backend_prometheus.h
75 src/backends.c
76 src/backends.h
77 src/clocks.c
@@ -28,14 +84,6 @@ set(NETDATA_SOURCE_FILES
84 src/dictionary.h
85 src/eval.c
86 src/eval.h
31 - src/freebsd_sysctl.c
32 - src/freebsd_getmntinfo.c
33 - src/freebsd_getifaddrs.c
34 - src/freebsd_devstat.c
35 - src/zfs_common.c
36 - src/zfs_common.h
37 - src/freebsd_kstat_zfs.c
38 - src/freebsd_ipfw.c
87 src/global_statistics.c
88 src/global_statistics.h
89 src/health.c
@@ -44,57 +92,25 @@ set(NETDATA_SOURCE_FILES
92 src/health_json.c
93 src/health_log.c
94 src/inlined.h
47 - src/ipc.c
48 - src/ipc.h
95 + src/locks.h
96 src/log.c
97 src/log.h
51 - src/macos_fw.c
52 - src/macos_mach_smi.c
53 - src/macos_sysctl.c
98 src/main.c
99 src/main.h
100 src/plugin_checks.c
101 src/plugin_checks.h
58 - src/plugin_freebsd.c
59 - src/plugin_freebsd.h
102 src/plugin_idlejitter.c
103 src/plugin_idlejitter.h
62 - src/plugin_macos.c
63 - src/plugin_macos.h
104 src/plugin_nfacct.c
105 src/plugin_nfacct.h
66 - src/plugin_proc.c
67 - src/plugin_proc.h
68 - src/plugin_proc_diskspace.c
69 - src/plugin_proc_diskspace.h
106 src/plugin_tc.c
107 src/plugin_tc.h
108 src/plugins_d.c
109 src/plugins_d.h
110 src/popen.c
111 src/popen.h
76 - src/proc_diskstats.c
77 - src/proc_interrupts.c
78 - src/proc_loadavg.c
79 - src/proc_meminfo.c
80 - src/proc_net_dev.c
81 - src/proc_net_ip_vs_stats.c
82 - src/proc_net_netstat.c
83 - src/proc_net_rpc_nfs.c
84 - src/proc_net_rpc_nfsd.c
85 - src/proc_net_snmp.c
86 - src/proc_net_snmp6.c
87 - src/proc_net_softnet_stat.c
88 - src/proc_net_stat_conntrack.c
89 - src/proc_net_stat_synproxy.c
112 src/proc_self_mountinfo.c
113 src/proc_self_mountinfo.h
92 - src/proc_softirqs.c
93 - src/proc_spl_kstat_zfs.c
94 - src/proc_stat.c
95 - src/proc_sys_kernel_random_entropy_avail.c
96 - src/proc_uptime.c
97 - src/proc_vmstat.c
114 src/procfile.c
115 src/procfile.h
116 src/registry.c
@@ -127,15 +143,20 @@ set(NETDATA_SOURCE_FILES
143 src/rrdset.c
144 src/rrdsetvar.c
145 src/rrdvar.c
146 + src/signals.c
147 + src/signals.h
148 src/simple_pattern.c
149 src/simple_pattern.h
132 - src/socket.c src/socket.h
150 + src/socket.c
151 + src/socket.h
152 + src/statistical.c
153 + src/statistical.h
154 + src/statsd.c
155 + src/statsd.h
156 src/storage_number.c
157 src/storage_number.h
158 src/sys_devices_system_edac_mc.c
159 src/sys_devices_system_node.c
137 - src/sys_fs_cgroup.c
138 - src/sys_kernel_mm_ksm.c
160 src/unit_test.c
161 src/unit_test.h
162 src/url.c
@@ -152,11 +173,7 @@ set(NETDATA_SOURCE_FILES
173 src/web_client.h
174 src/web_server.c
175 src/web_server.h
155 - src/locks.h
156 - src/statsd.c src/statsd.h
157 - src/statistical.c src/statistical.h
158 - src/backend_prometheus.c src/backend_prometheus.h
159 - src/signals.c src/signals.h
176 + config.h
177 )
178
179 set(APPS_PLUGIN_SOURCE_FILES
@@ -213,9 +230,15 @@ include_directories(AFTER .)
230
231 add_definitions(-DHAVE_CONFIG_H -DCACHE_DIR="/var/cache/netdata" -DCONFIG_DIR="/etc/netdata" -DLOG_DIR="/var/log/netdata" -DPLUGINS_DIR="/usr/libexec/netdata" -DWEB_DIR="/usr/share/netdata" -DVARLIB_DIR="/var/lib/netdata")
232
216 -add_executable(netdata ${NETDATA_SOURCE_FILES})
233 +add_executable(netdata ${NETDATA_COMMON_FILES} ${NETDATA_LINUX_FILES})
234 target_link_libraries (netdata m z uuid ${CMAKE_THREAD_LIBS_INIT})
235
236 +add_executable(netdata_freebsd ${NETDATA_COMMON_FILES} ${NETDATA_FREEBSD_FILES})
237 +target_link_libraries (netdata_freebsd m z uuid ${CMAKE_THREAD_LIBS_INIT})
238 +
239 +add_executable(netdata_macos ${NETDATA_COMMON_FILES} ${NETDATA_MACOS_FILES})
240 +target_link_libraries (netdata_macos m z uuid ${CMAKE_THREAD_LIBS_INIT})
241 +
242 add_executable(apps.plugin ${APPS_PLUGIN_SOURCE_FILES} src/inlined.h)
243 target_link_libraries (apps.plugin m ${CMAKE_THREAD_LIBS_INIT})
244
src/Makefile.am
+4 -2
@@ -137,7 +137,8 @@ netdata_SOURCES = \
137 sys_devices_system_node.c \
138 unit_test.c \
139 unit_test.h \
140 - url.c url.h \
140 + url.c \
141 + url.h \
142 web_api_old.c \
143 web_api_old.h \
144 web_api_v1.c \
@@ -176,7 +177,8 @@ netdata_SOURCES += \
177 $(NULL)
178 else
179 netdata_SOURCES += \
179 - ipc.c ipc.h \
180 + ipc.c \
181 + ipc.h \
182 plugin_proc.c \
183 plugin_proc.h \
184 plugin_proc_diskspace.c \