-
Notifications
You must be signed in to change notification settings - Fork 165
Add DEPTHAI_INSTALL_PREFIX to depthaiConfig.cmake, install libusb DLL for every depthai example #1475
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
lnotspotl
wants to merge
9
commits into
develop
Choose a base branch
from
lnotspotl/update_depthai_installation
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add DEPTHAI_INSTALL_PREFIX to depthaiConfig.cmake, install libusb DLL for every depthai example #1475
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
64faa34
install libusb (brought in by vcpkg) alongside depthai-core if enabled
lnotspotl ad56060
update depthaiConfig.cmake.in to set the DEPTHAI_INSTALL_PREFIX path
lnotspotl 8a07a8c
Merge branch 'develop' into lnotspotl/update_depthai_installation
lnotspotl 0790ce0
Add usb-1.0 as a dependency for all depthai's examples
lnotspotl 2aaeaa9
Update cmake/depthaiHelpers.cmake
lnotspotl f058ef0
fix add_runtime_dependencies bug
lnotspotl b3c5aa5
create symlinks as opposed to copies
lnotspotl c07ddbf
merge develop in
lnotspotl 52e9df9
back to copies for some folders
lnotspotl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # CreateSymlinks.cmake - Creates symbolic links for DLLs | ||
| # Usage: cmake -DDLLS="dll1;dll2;..." -DDEST_DIR="path" -P CreateSymlinks.cmake | ||
|
|
||
| message(DEBUG "Creating symlinks: ${DLLS} \n Destination path: ${DEST_DIR}") | ||
|
|
||
| if(NOT DEFINED DLLS OR NOT DEFINED DEST_DIR) | ||
| return() | ||
| endif() | ||
|
|
||
| foreach(dll IN LISTS DLLS) | ||
| # Extract dll_name (without path) | ||
| get_filename_component(dll_name "${dll}" NAME) | ||
|
|
||
| # Create destination | ||
| set(link_path "${DEST_DIR}/${dll_name}") | ||
|
|
||
| # Remove original symlink if it exists | ||
| if(EXISTS "${link_path}") | ||
| file(REMOVE "${link_path}") | ||
| endif() | ||
|
|
||
| message(DEBUG "Creating symlink: ${link_path} ---> ${dll}") | ||
|
|
||
| # Create symbolic link | ||
| file(CREATE_LINK "${dll}" "${link_path}" SYMBOLIC RESULT result_var) | ||
|
|
||
| if(result_var) | ||
| message(WARNING "Failed to create symlink from '${dll}' to '${link_path}': ${result_var}") | ||
| endif() | ||
|
|
||
| endforeach() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,13 @@ | ||
| include(CMakeFindDependencyMacro) | ||
|
|
||
| get_filename_component(CMAKE_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) | ||
| include(${CMAKE_CURRENT_LIST_DIR}/@[email protected]) | ||
|
|
||
| message(STATUS "Found depthai: ${CMAKE_CURRENT_LIST_DIR} (found version: ${PACKAGE_VERSION})") | ||
|
|
||
| # Assume we are in <install-prefix>/lib/cmake/depthai/depthaiConfig.cmake | ||
| get_filename_component(DEPTHAI_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) | ||
|
|
||
| find_dependency(nlohmann_json CONFIG REQUIRED) | ||
| find_dependency(libnop CONFIG REQUIRED) | ||
| find_dependency(XLink CONFIG REQUIRED COMPONENTS XLinkPublic) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| macro(add_runtime_dependencies depending_target dependency) | ||
| if(TARGET ${dependency}) | ||
| get_property(imported_configs TARGET ${dependency} PROPERTY IMPORTED_CONFIGURATIONS) | ||
| set(dlls "") | ||
| message(DEBUG "Adding runtime dependencies for ${depending_target} on ${dependency}. Imported configurations: ${imported_configs}") | ||
| foreach(cfg ${imported_configs}) | ||
| message(DEBUG "Adding runtime dependencies for ${depending_target} on ${dependency} (${cfg})") | ||
| get_property(dll TARGET ${dependency} PROPERTY IMPORTED_LOCATION_${cfg}) | ||
| message(DEBUG "Retrieved dll for ${cfg}: '${dll}'") | ||
| list(APPEND dlls $<$<CONFIG:${cfg}>:${dll}>) | ||
| endforeach() | ||
| message(DEBUG "Required dlls for ${depending_target} on ${dependency} are: ${dlls}") | ||
| endif() | ||
| # Create a list of required dll files | ||
| if(DEFINED required_dll_files) | ||
| list(APPEND required_dll_files ${dlls}) | ||
| else() | ||
| set(required_dll_files ${dlls}) | ||
| endif() | ||
| # Copy the required dlls | ||
| if(WIN32) | ||
| add_custom_command(TARGET ${depending_target} POST_BUILD COMMAND | ||
| ${CMAKE_COMMAND} -E copy_if_different ${dlls} ${depthai_dll_libraries} $<TARGET_FILE_DIR:${depending_target}> | ||
| COMMAND_EXPAND_LISTS | ||
| ) | ||
| message(DEBUG "Required dlls for ${depending_target} are: ${required_dll_files}") | ||
| endif() | ||
| endmacro() | ||
|
|
||
| macro(add_runtime_dependencies_symlinked depending_target dependency) | ||
| if(TARGET ${dependency}) | ||
| get_property(imported_configs TARGET ${dependency} PROPERTY IMPORTED_CONFIGURATIONS) | ||
| set(dlls "") | ||
| message(DEBUG "Adding runtime dependencies for ${depending_target} on ${dependency}. Imported configurations: ${imported_configs}") | ||
| foreach(cfg ${imported_configs}) | ||
| message(DEBUG "Adding runtime dependencies for ${depending_target} on ${dependency} (${cfg})") | ||
| get_property(dll TARGET ${dependency} PROPERTY IMPORTED_LOCATION_${cfg}) | ||
| message(DEBUG "Retrieved dll for ${cfg}: '${dll}'") | ||
| list(APPEND dlls $<$<CONFIG:${cfg}>:${dll}>) | ||
| endforeach() | ||
| message(DEBUG "Required dlls for ${depending_target} on ${dependency} are: ${dlls}") | ||
| endif() | ||
| # Create a list of required dll files | ||
| if(DEFINED required_dll_files) | ||
| list(APPEND required_dll_files ${dlls}) | ||
| else() | ||
| set(required_dll_files ${dlls}) | ||
| endif() | ||
| # Copy the required dlls | ||
| if(WIN32) | ||
| foreach(dll_path IN LISTS required_dll_files) | ||
| add_custom_command(TARGET ${depending_target} POST_BUILD COMMAND | ||
| ${CMAKE_COMMAND} -DDLLS=${dll_path} -DDEST_DIR=$<TARGET_FILE_DIR:${depending_target}> | ||
| -P "${CMAKE_SOURCE_DIR}/cmake/CreateSymlinks.cmake" | ||
| VERBATIM | ||
| ) | ||
| endforeach() | ||
| message(DEBUG "Required dlls for ${depending_target} are: ${required_dll_files}") | ||
| endif() | ||
| endmacro() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The debug messages contain inconsistent terminology - some refer to 'core' while others use the actual target name. Line 23 should use '${depending_target}' instead of hardcoded 'core' for consistency.