Fix public include paths.

Author: crowbar27

power_overwhelming/CMakeLists.txt

@@ -57,7 +57,6 @@ target_include_directories(${PROJECT_NAME}
         $<BUILD_INTERFACE:${SourceDir}>)
 
 target_link_libraries(${PROJECT_NAME}
-    PUBLIC salieri
     PRIVATE adl nlohmann_json nvml tinkerforge)
 
 if (WIN32)

power_overwhelming/include/power_overwhelming/adl_sensor.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "adl_sensor_source.h"
-#include "sensor.h"
+#include "power_overwhelming/adl_sensor_source.h"
+#include "power_overwhelming/sensor.h"
 
 
 namespace visus {

power_overwhelming/include/power_overwhelming/emi_sensor.h

@@ -12,7 +12,7 @@
 #include <tchar.h>
 #endif /* defined(_WIN32) */
 
-#include "sensor.h"
+#include "power_overwhelming/sensor.h"
 
 
 namespace visus {

power_overwhelming/include/power_overwhelming/nvml_sensor.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "sensor.h"
+#include "power_overwhelming/sensor.h"
 
 
 namespace visus {

power_overwhelming/include/power_overwhelming/power_overwhelming_api.h

@@ -24,9 +24,22 @@
 
 #else /* defined(_WIN32) */
 // Empty SAL annotations for rancid platforms.
-#include "salieri.h"
-
-// These are missing in the salieri header.
 #define _Analysis_assume_(expr)
+#define _In_
+#define _Inout_
+#define _Inout_opt_
+#define _In_opt_
+#define _In_opt_z_
+#define _In_reads_(cnt)
+#define _In_reads_or_z_(cnt)
+#define _In_z_
+#define _Out_
+#define _Out_writes_(cnt)
+#define _Out_writes_bytes_(cnt)
+#define _Out_writes_opt_(cnt)
+#define _Out_writes_opt_z_(cnt)
+#define _Ret_maybenull_
+#define _Ret_maybenull_z_
 #define _Ret_valid_
+#define _Ret_z_
 #endif /* defined(_WIN32) */

third_party/CMakeLists.txt

@@ -58,18 +58,6 @@ set(RsHmc8015Include ${RsHmc8015Dir} PARENT_SCOPE)
 set(RsRtxDir ${CMAKE_CURRENT_SOURCE_DIR}/rsrtx-cvi-1.4.0)
 set(RsRtxInclude ${RsRtxDir} PARENT_SCOPE)
 
-# SAL annotations
-FetchContent_Declare(salieri
-    URL "https://github.com/nemequ/salieri/archive/refs/heads/master.zip"
-)
-FetchContent_MakeAvailable(salieri)
-add_library(salieri INTERFACE IMPORTED GLOBAL)
-set_target_properties(salieri PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${salieri_SOURCE_DIR}")
-
-mark_as_advanced(FORCE
-    FETCHCONTENT_SOURCE_DIR_SALIERI
-    FETCHCONTENT_UPDATES_DISCONNECTED_SALIERI)
-
 # Tinkerforge API
 set(TinkerforgeDir ${CMAKE_CURRENT_SOURCE_DIR}/tinkerforge_c_bindings_2_1_32/source)
 file(GLOB_RECURSE TinkerforgeHeaderFiles "${TinkerforgeDir}/*.h" "${TinkerforgeDir}/*.inl")