Allow passing cmake options with NETDATA_CMAKE_OPTIONS. (#16598)
vkalintiris committed
Dec 13, 2023 at 21:07 UTC
36f55469ad4e7e826cb04c8ed94768732f265b18
2 files changed
+5
-2
CMakeLists.txt
+3
-1
@@ -65,7 +65,9 @@ set(CMAKE_CXX_STANDARD 11)
65
set(CMAKE_C_STANDARD_REQUIRED On)
66
set(CMAKE_CXX_STANDARD_REQUIRED On)
67
68
-set(CMAKE_BUILD_TYPE "Release")
68
+if(NOT CMAKE_BUILD_TYPE)
69
+ set(CMAKE_BUILD_TYPE "Release")
70
+endif()
71
72
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
73
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
netdata-installer.sh
+2
-1
@@ -290,6 +290,7 @@ ENABLE_CLOUD=1
290
ENABLE_LOGS_MANAGEMENT=1
291
ENABLE_LOGS_MANAGEMENT_TESTS=0
292
NETDATA_CMAKE_OPTIONS="${NETDATA_CMAKE_OPTIONS-}"
293
+
294
RELEASE_CHANNEL="nightly" # valid values are 'nightly' and 'stable'
295
IS_NETDATA_STATIC_BINARY="${IS_NETDATA_STATIC_BINARY:-"no"}"
296
while [ -n "${1}" ]; do
@@ -1159,7 +1160,7 @@ NETDATA_GROUP="$(id -g -n "${NETDATA_USER}" 2> /dev/null)"
1160
[ -z "${NETDATA_GROUP}" ] && NETDATA_GROUP="${NETDATA_USER}"
1161
echo >&2 "Netdata user and group set to: ${NETDATA_USER}/${NETDATA_GROUP}"
1162
1162
-NETDATA_CMAKE_OPTIONS="-S ./ -B ${NETDATA_BUILD_DIR} ${CMAKE_OPTS} -DCMAKE_INSTALL_PREFIX=${NETDATA_PREFIX} ${NETDATA_USER:+-DNETDATA_USER=${NETDATA_USER}} "
1163
+NETDATA_CMAKE_OPTIONS="-S ./ -B ${NETDATA_BUILD_DIR} ${CMAKE_OPTS} -DCMAKE_INSTALL_PREFIX=${NETDATA_PREFIX} ${NETDATA_USER:+-DNETDATA_USER=${NETDATA_USER}} ${NETDATA_CMAKE_OPTIONS} "
1164
1165
# Feature autodetection code starts here
1166