Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ project( ${LRS_TARGET} LANGUAGES CXX C )
set(REPO_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${REPO_ROOT})

# see cmake/lrs_options.cmake for cmake options
include(CMake/lrs_options.cmake)
include(CMake/connectivity_check.cmake)
#Deprecation message, should be removed in future releases
Expand Down
7 changes: 0 additions & 7 deletions common/fw/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,3 @@ function(target_binary url version sha1 symbol ext)
endfunction()

target_binary( "${D4XX_FW_URL}" "${D4XX_FW_VERSION}" "${D4XX_FW_SHA1}" D4XX_FW_Image .bin)


install(TARGETS ${PROJECT_NAME} EXPORT realsense2Targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

4 changes: 2 additions & 2 deletions third-party/realsense-file/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif()

set_property(GLOBAL PROPERTY USE_FOLDERS ON)

add_library(${PROJECT_NAME} STATIC
add_library(${PROJECT_NAME}
${AllSources}
${HEADER_FILES_ROSBAG}
${SOURCE_FILES_ROSBAG}
Expand All @@ -42,7 +42,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
$<$<BOOL:${USE_EXTERNAL_LZ4}>:lz4::lz4>
)

#set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${LIBVERSION}" SOVERSION "${LIBSOVERSION}")
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${REALSENSE_VERSION_STRING} SOVERSION "${REALSENSE_VERSION_MAJOR}.${REALSENSE_VERSION_MINOR}")

set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER Library)

Expand Down
3 changes: 2 additions & 1 deletion third-party/rsutils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
cmake_minimum_required(VERSION 3.8.0) # source_group(TREE)
project( rsutils )

add_library( ${PROJECT_NAME} STATIC "" )
add_library( ${PROJECT_NAME} "" )
# We cannot directly interface with nlohmann_json (doesn't work on bionic)
#target_link_libraries( ${PROJECT_NAME} PUBLIC nlohmann_json )
target_compile_features( ${PROJECT_NAME} PUBLIC cxx_std_14 )
set_target_properties( ${PROJECT_NAME} PROPERTIES FOLDER Library )
set_target_properties( ${PROJECT_NAME} PROPERTIES VERSION ${REALSENSE_VERSION_STRING} SOVERSION "${REALSENSE_VERSION_MAJOR}.${REALSENSE_VERSION_MINOR}")

target_include_directories( ${PROJECT_NAME}
PUBLIC
Expand Down