From e9ded075f57d5c932ce5a235406c6bfe2185f66e Mon Sep 17 00:00:00 2001 From: Patrick Kappl Date: Thu, 11 Jan 2024 13:35:59 +0100 Subject: [PATCH 1/2] Fix include directories of library target --- sdk_core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_core/CMakeLists.txt b/sdk_core/CMakeLists.txt index 461e595..a2e8d87 100644 --- a/sdk_core/CMakeLists.txt +++ b/sdk_core/CMakeLists.txt @@ -17,10 +17,10 @@ set(LIVOX_SDK_VERSION_STRING "${LIVOX_SDK_MAJOR_VERSION}.${LIVOX_SDK_MINOR_VERSI target_include_directories(${SDK_LIBRARY} PUBLIC "$" + PRIVATE "$" "$" "$" - PRIVATE src) set_target_properties(${SDK_LIBRARY} PROPERTIES PUBLIC_HEADER "include/livox_def.h;include/livox_sdk.h") From ba603921d40985856063a8c13e27d0c9b970061a Mon Sep 17 00:00:00 2001 From: Patrick Kappl Date: Thu, 11 Jan 2024 13:52:19 +0100 Subject: [PATCH 2/2] Fix include directories of samples --- sample/hub_lvx_file/CMakeLists.txt | 4 ++++ sample/lidar_lvx_file/CMakeLists.txt | 4 ++++ sample_cc/hub/CMakeLists.txt | 4 ++++ sample_cc/lidar/CMakeLists.txt | 14 ++++++++++++++ sample_cc/lidar_utc_sync/CMakeLists.txt | 4 ++++ sdk_core/CMakeLists.txt | 1 - 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/sample/hub_lvx_file/CMakeLists.txt b/sample/hub_lvx_file/CMakeLists.txt index e7ddf56..10d81d9 100644 --- a/sample/hub_lvx_file/CMakeLists.txt +++ b/sample/hub_lvx_file/CMakeLists.txt @@ -7,3 +7,7 @@ target_link_libraries(${DEMO_NAME} PRIVATE ${PROJECT_NAME}_static ) +target_include_directories(${DEMO_NAME} + PRIVATE + "${CMAKE_SOURCE_DIR}/sdk_core/include/third_party/cmdline" + ) diff --git a/sample/lidar_lvx_file/CMakeLists.txt b/sample/lidar_lvx_file/CMakeLists.txt index 46d5d99..938c534 100644 --- a/sample/lidar_lvx_file/CMakeLists.txt +++ b/sample/lidar_lvx_file/CMakeLists.txt @@ -7,3 +7,7 @@ target_link_libraries(${DEMO_NAME} PRIVATE ${PROJECT_NAME}_static ) +target_include_directories(${DEMO_NAME} + PRIVATE + "${CMAKE_SOURCE_DIR}/sdk_core/include/third_party/cmdline" + ) diff --git a/sample_cc/hub/CMakeLists.txt b/sample_cc/hub/CMakeLists.txt index 5840403..9966f72 100644 --- a/sample_cc/hub/CMakeLists.txt +++ b/sample_cc/hub/CMakeLists.txt @@ -7,3 +7,7 @@ target_link_libraries(${DEMO_NAME} PRIVATE ${PROJECT_NAME}_static ) +target_include_directories(${DEMO_NAME} + PRIVATE + "${CMAKE_SOURCE_DIR}/sdk_core/include/third_party/cmdline" + ) diff --git a/sample_cc/lidar/CMakeLists.txt b/sample_cc/lidar/CMakeLists.txt index 07aeed1..2a6b854 100644 --- a/sample_cc/lidar/CMakeLists.txt +++ b/sample_cc/lidar/CMakeLists.txt @@ -7,3 +7,17 @@ target_link_libraries(${DEMO_NAME} PRIVATE ${PROJECT_NAME}_static ) +target_include_directories(${DEMO_NAME} + PRIVATE + "${CMAKE_SOURCE_DIR}/sdk_core/include/third_party/cmdline" + ) + +message("----- CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}") +message("----- CMAKE_CURRENT_SOURCE_DIR = ${CMAKE_CURRENT_SOURCE_DIR}") +message("----- CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}") +message("----- CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") +message("----- PROJECT_SOURCE_DIR = ${PROJECT_SOURCE_DIR}") + + +get_target_property(incl_dirs ${DEMO_NAME} INCLUDE_DIRECTORIES) +message("----- ${DEMO_NAME} incl dirs = ${incl_dirs}") diff --git a/sample_cc/lidar_utc_sync/CMakeLists.txt b/sample_cc/lidar_utc_sync/CMakeLists.txt index 9c84884..c60b3f4 100644 --- a/sample_cc/lidar_utc_sync/CMakeLists.txt +++ b/sample_cc/lidar_utc_sync/CMakeLists.txt @@ -11,3 +11,7 @@ target_link_libraries(${DEMO_NAME} PRIVATE ${PROJECT_NAME}_static ) +target_include_directories(${DEMO_NAME} + PRIVATE + "${CMAKE_SOURCE_DIR}/sdk_core/include/third_party/cmdline" + ) \ No newline at end of file diff --git a/sdk_core/CMakeLists.txt b/sdk_core/CMakeLists.txt index a2e8d87..54b0cc0 100644 --- a/sdk_core/CMakeLists.txt +++ b/sdk_core/CMakeLists.txt @@ -20,7 +20,6 @@ target_include_directories(${SDK_LIBRARY} PRIVATE "$" "$" - "$" src) set_target_properties(${SDK_LIBRARY} PROPERTIES PUBLIC_HEADER "include/livox_def.h;include/livox_sdk.h")