Fix windows build (#21113)
Stelios Fragkakis committed
Oct 8, 2025 at 01:49 UTC
c1734f303b4ab0aef507efad15684d04c2013ee8
2 files changed
+9
-9
CMakeLists.txt
+3
-3
@@ -80,15 +80,15 @@ if(USE_MOLD)
80
endif()
81
endif()
82
83
+set(BINDIR usr/sbin)
84
+set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}")
85
+# This can be changed depending on the platform with the include below
86
include(NetdataPlatform)
87
include(NetdataCompilerFlags)
88
89
set(CONFIG_H_DIR ${CMAKE_BINARY_DIR})
90
set(CONFIG_H ${CONFIG_H_DIR}/config.h)
91
89
-set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}")
90
-set(BINDIR usr/sbin)
91
-
92
if(NOT NETDATA_RUNTIME_PREFIX STREQUAL "")
93
string(REGEX REPLACE "/$" "" NETDATA_RUNTIME_PREFIX "${NETDATA_RUNTIME_PREFIX}")
94
endif()
packaging/windows/netdata.wxs.in
+6
-6
@@ -141,9 +141,9 @@
141
<!-- All the files except for the ones we need to handle specially -->
142
<ComponentGroup Id="NetdataComponents" Directory="INSTALLFOLDER">
143
<Files Include="C:\msys64\opt\netdata\**">
144
- <Exclude Files="C:\msys64\opt\netdata\usr\sbin\netdata.exe" />
145
- <Exclude Files="C:\msys64\opt\netdata\usr\sbin\wevt_netdata_manifest.xml" />
146
- <Exclude Files="C:\msys64\opt\netdata\usr\sbin\wevt_netdata.dll" />
144
+ <Exclude Files="C:\msys64\opt\netdata\usr\bin\netdata.exe" />
145
+ <Exclude Files="C:\msys64\opt\netdata\usr\bin\wevt_netdata_manifest.xml" />
146
+ <Exclude Files="C:\msys64\opt\netdata\usr\bin\wevt_netdata.dll" />
147
</Files>
148
</ComponentGroup>
149
@@ -208,10 +208,10 @@
208
209
<!-- Install wevt manifest/dll files -->
210
<ComponentGroup Id="WevtComponents" Directory="System64Folder">
211
- <File Id="WevtDll" Name="wevt_netdata.dll" Source="C:\msys64\opt\netdata\usr\sbin\wevt_netdata.dll">
211
+ <File Id="WevtDll" Name="wevt_netdata.dll" Source="C:\msys64\opt\netdata\usr\bin\wevt_netdata.dll">
212
</File>
213
214
- <File Id="WevtManifest" Name="wevt_netdata_manifest.xml" Source="C:\msys64\opt\netdata\usr\sbin\wevt_netdata_manifest.xml">
214
+ <File Id="WevtManifest" Name="wevt_netdata_manifest.xml" Source="C:\msys64\opt\netdata\usr\bin\wevt_netdata_manifest.xml">
215
</File>
216
</ComponentGroup>
217
@@ -226,7 +226,7 @@
226
</InstallExecuteSequence>
227
228
<Component Id="NetdataService" Directory="USRBINDIR">
229
- <File Id="netdata.exe" Source="C:\msys64\opt\netdata\usr\sbin\netdata.exe" KeyPath="yes" />
229
+ <File Id="netdata.exe" Source="C:\msys64\opt\netdata\usr\bin\netdata.exe" KeyPath="yes" />
230
231
<ServiceInstall Id="InstallService"
232
Name="Netdata"