Skip to content
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

Fixed the issue that caused CMake to look for non-existent path after being installed #213

Merged
merged 2 commits into from
May 3, 2021
Merged

Fixed the issue that caused CMake to look for non-existent path after being installed #213

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2b505c
Fixed the issue that caused CMake to look a non-existance path
unexploredtest May 3, 2021
b0bca97
removed explicit include dir for android
unexploredtest May 3, 2021
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
20 changes: 16 additions & 4 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,24 @@ endif()

target_include_directories(
kompute PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/single_include>
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:single_include>
${CMAKE_CURRENT_SOURCE_DIR}/include
${PROJECT_SOURCE_DIR}/single_include
)

# To build the Android example without installing Vulkan Kompute,
# We need to specify the paths for include directories directly
# NOTE: This is a temporary fix
if(KOMPUTE_OPT_ANDOID_BUILD)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noticed there is a typo on this flag, but it seems it's correct - I think for now may be worth just removing for now and we can add this guard as separate commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

target_include_directories(
kompute PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/single_include>
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:single_include>
)
endif()


if(NOT KOMPUTE_OPT_ANDOID_BUILD)
target_link_libraries(
kompute
Expand Down