Skip to content

Revert per-config samples install directories #113

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
bashbaug merged 2 commits into from
Oct 11, 2024
Merged

Revert per-config samples install directories #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
200e8fb
Revert install tree modifications
Beanavil Oct 9, 2024
af9643c
Make vendors path not depend on hard-coded POCL install path
Beanavil Oct 10, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/presubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,8 @@ jobs:
if [[ "${{matrix.GEN}}" == "Ninja Multi-Config" && ! `which ninja` ]]; then brew install ninja; fi &&
# We need to provide an OpenCL driver for Intel CPU on mac
brew install pocl
echo "OCL_ICD_VENDORS=/opt/homebrew/Cellar/pocl/6.0/etc/OpenCL/vendors" >> $GITHUB_ENV
POCL_INSTALL_PATH=$(brew --prefix pocl)
echo "OCL_ICD_VENDORS=$POCL_INSTALL_PATH/etc/OpenCL/vendors" >> $GITHUB_ENV
cmake --version

- name: Install dependencies (Homebrew)
Expand Down
21 changes: 10 additions & 11 deletions samples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,17 @@ macro(add_sample)
)

foreach(CONFIG ${OPENCL_SAMPLE_CONFIGS})
install(TARGETS ${OPENCL_SAMPLE_TARGET} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR}/${CONFIG})
install(FILES ${OPENCL_SAMPLE_KERNELS} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR}/${CONFIG})
install(FILES ${OPENCL_SAMPLE_SHADERS} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR}/${CONFIG})
if(OPENCL_SDK_TEST_SAMPLES AND OPENCL_SAMPLE_TEST)
add_test(
NAME "${OPENCL_SAMPLE_TARGET}_${CONFIG}"
COMMAND ${OPENCL_SAMPLE_TARGET}
CONFIGURATIONS ${CONFIG}
WORKING_DIRECTORY "$<TARGET_FILE_DIR:${OPENCL_SAMPLE_TARGET}>"
)
endif()
install(TARGETS ${OPENCL_SAMPLE_TARGET} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${OPENCL_SAMPLE_KERNELS} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${OPENCL_SAMPLE_SHADERS} CONFIGURATIONS ${CONFIG} DESTINATION ${CMAKE_INSTALL_BINDIR})
endforeach()
if(OPENCL_SDK_TEST_SAMPLES AND OPENCL_SAMPLE_TEST)
add_test(
NAME ${OPENCL_SAMPLE_TARGET}
COMMAND ${OPENCL_SAMPLE_TARGET}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
)
endif()
endmacro()


Expand Down