Skip to content

Fixed check for user-provided toolchain file when given relative path #645

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.

Sign up for GitHub

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

Merged
themarpe merged 3 commits into from
Nov 22, 2022
Merged

Fixed check for user-provided toolchain file when given relative path #645

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b2dc19
Fixed check for user-provided toolchain file when given relative path
camblomquist Nov 21, 2022
bf7bfcd
Revert "Fixed check for user-provided toolchain file when given relat…
camblomquist Nov 22, 2022
e4d3528
Fixed check for user-provided toolchain file when given relative path
camblomquist Nov 22, 2022
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
Prev Previous commit
Next Next commit
Revert "Fixed check for user-provided toolchain file when given relat… 
…ive path"

This reverts commit 1b2dc19.
  • Loading branch information
@camblomquist
camblomquist committed Nov 22, 2022
commit bf7bfcd9af9572b1afcd13214fb94a954eedb85b
11 changes: 6 additions & 5 deletions cmake/toolchain/custom.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ if(NOT "@CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
if("@_INTERNAL_DEPTHAI_ORIGINAL_CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
# Variable not set, initial project configuration.
# Path to original toolchain saved in CMAKE_TOOLCHAIN_FILE.

get_filename_component(
_original_toolchain_file "@CMAKE_TOOLCHAIN_FILE@"
ABSOLUTE BASE_DIR @CMAKE_CURRENT_SOURCE_DIR@
)
if(NOT EXISTS "@CMAKE_TOOLCHAIN_FILE@")
message(
FATAL_ERROR "File not found: '@CMAKE_TOOLCHAIN_FILE@'"
)
endif()
set(_original_toolchain_file "@CMAKE_TOOLCHAIN_FILE@")
else()
set(_original_toolchain_file "@_INTERNAL_DEPTHAI_ORIGINAL_CMAKE_TOOLCHAIN_FILE@")
endif()
Expand Down