diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt index 57df2d0..b03b8dc 100644 --- a/src/os/CMakeLists.txt +++ b/src/os/CMakeLists.txt @@ -35,7 +35,6 @@ target_sources(OSAPI PRIVATE "include/os/os_project.h") target_include_directories(OSAPI PUBLIC "$") -# "$") 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() diff --git a/src/os/include/os/os_decl_attributes.h b/src/os/include/os/os_decl_attributes.h index 3e80c66..c2ea8cb 100644 --- a/src/os/include/os/os_decl_attributes.h +++ b/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 diff --git a/src/os/include/os/os_public.h b/src/os/include/os/os_public.h index 873d880..df54b90 100644 --- a/src/os/include/os/os_public.h +++ b/src/os/include/os/os_public.h @@ -13,7 +13,7 @@ #define OS_PUBLIC_H #include -#include "os/os_platform_public.h" -#include "os/os_decl_attributes.h" +#include "os_platform_public.h" +#include "os_decl_attributes.h" #endif diff --git a/src/os/include/os/windows/os_platform_thread.h b/src/os/include/os/windows/os_platform_thread.h index 998865c..d3f6664 100644 --- a/src/os/include/os/windows/os_platform_thread.h +++ b/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" {