Change install location of OS abstraction files to a subdirectory of ddsc

This patch puts all installed include files under PREFIX/include/ddsc so we no longer create a /usr/local/include/os directory in a default installation.

Signed-off-by: Erik Boasson <eb@ilities.com>

src/os/CMakeLists.txt

@@ -35,7 +35,6 @@ target_sources(OSAPI PRIVATE "include/os/os_project.h")
 target_include_directories(OSAPI
     PUBLIC
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/>")
-#        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
 
 if(BUILD_TESTING)
   add_subdirectory(tests)
@@ -43,19 +42,19 @@ endif()
 
 install(
   FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/os/os_public.h" "${CMAKE_CURRENT_SOURCE_DIR}/include/os/os_decl_attributes.h" "${CMAKE_CURRENT_SOURCE_DIR}/include/os/os_decl_attributes_sal.h"
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/os"
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ddsc/os"
   COMPONENT dev)
 
 # Currently, only windows and posix platforms are supported.
 IF(WIN32 AND NOT UNIX)
     install(
       FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/os/windows/os_platform_public.h"
-      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/os"
+      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ddsc/os"
       COMPONENT dev)
 ELSE()
     install(
       FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/os/posix/os_platform_public.h"
-      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/os"
+      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ddsc/os"
       COMPONENT dev)
 ENDIF()
 

src/os/include/os/os_decl_attributes.h

@@ -123,7 +123,7 @@
 # endif
 #endif
 
-#include "os/os_decl_attributes_sal.h"
+#include "os_decl_attributes_sal.h"
 
 #undef OS_GNUC_VERSION
 #endif

src/os/include/os/os_public.h

@@ -13,7 +13,7 @@
 #define OS_PUBLIC_H
 
 #include <stddef.h>
-#include "os/os_platform_public.h"
-#include "os/os_decl_attributes.h"
+#include "os_platform_public.h"
+#include "os_decl_attributes.h"
 
 #endif

src/os/include/os/windows/os_platform_thread.h

@@ -12,7 +12,7 @@
 #ifndef OS_PLATFORM_THREAD_H
 #define OS_PLATFORM_THREAD_H
 
-#include "os/os_defs.h"
+#include "os_defs.h"
 
 #if defined (__cplusplus)
 extern "C" {