Skip to content

Added OpenCL.pc file. #190

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 16 commits into from
Jan 10, 2023
Merged

Added OpenCL.pc file. #190

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
88d9a3a
Added OpenCL.pc file.
Kerilk Oct 10, 2022
276b236
Updated pkg-config support to only be deacitvated when MSVC is used.
Kerilk Oct 11, 2022
f3ffcfe
Update OpenCL.pc.in
Kerilk Oct 11, 2022
88d6914
Add CI for pkg-config for Linux.
Kerilk Oct 13, 2022
34a5955
Added CI for pkg-config for MacOS.
Kerilk Oct 13, 2022
47fcebb
Fix typo.
Kerilk Oct 13, 2022
b7afcf4
Add consume pkg-config test for Linux.
Kerilk Oct 18, 2022
72f8e04
Attempt to fix old CMake (ugly...).
Kerilk Oct 18, 2022
a30ba05
Revert "Attempt to fix old CMake (ugly...)."
Kerilk Oct 18, 2022
2df9bf0
Attempt fix.
Kerilk Oct 18, 2022
d6483fb
Attempt MacOS.
Kerilk Oct 18, 2022
99cb45c
Merge pull request #3 from Kerilk/pkg-config2
Kerilk Oct 18, 2022
344484c
Add hopefully correct pkg-config / CMake integration.
Kerilk Nov 30, 2022
566354f
Update OpenCL.pc.in
Kerilk Jan 10, 2023
fdc82ea
Update OpenCL.pc.in
Kerilk Jan 10, 2023
3b1b58a
Add Headers to PKG_CONFIG_PATH and remove symlink to headers.
Kerilk Jan 10, 2023
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
50 changes: 50 additions & 0 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,30 @@ jobs:
cd $GITHUB_WORKSPACE/build/downstream/sdk ;
$CTEST_EXE --output-on-failure

- name: Test pkg-config --cflags
shell: bash
run: PKG_CONFIG_PATH="$GITHUB_WORKSPACE/install/lib/pkgconfig" pkg-config OpenCL --cflags | grep -q "\-I$GITHUB_WORKSPACE/install/include"

- name: Test pkg-config --libs
shell: bash
run: PKG_CONFIG_PATH="$GITHUB_WORKSPACE/install/lib/pkgconfig" pkg-config OpenCL --libs | grep -q "\-L$GITHUB_WORKSPACE/install/lib -lOpenCL"

- name: Consume pkg-config
shell: bash
run: ln -s $GITHUB_WORKSPACE/external/OpenCL-Headers/install/include $GITHUB_WORKSPACE/install/include;
PKG_CONFIG_PATH="$GITHUB_WORKSPACE/install/lib/pkgconfig" $CMAKE_EXE
-G "${{matrix.GEN}}"
-D CMAKE_C_COMPILER=${{matrix.COMPILER}}
-D CMAKE_C_FLAGS="-Wall -Wextra -pedantic -m${{matrix.BIN}}"
-D CMAKE_C_STANDARD=${{matrix.STD}}
-D CMAKE_C_EXTENSIONS=${{matrix.EXT}}
-D DRIVER_STUB_PATH=$GITHUB_WORKSPACE/build/libOpenCLDriverStub.so
-B$GITHUB_WORKSPACE/build/downstream/pkgconfig
-H$GITHUB_WORKSPACE/test/pkgconfig/pkgconfig ;
$CMAKE_EXE --build $GITHUB_WORKSPACE/build/downstream/pkgconfig ;
cd $GITHUB_WORKSPACE/build/downstream/pkgconfig ;
$CTEST_EXE --output-on-failure




Expand Down Expand Up @@ -266,3 +290,29 @@ jobs:
cd $GITHUB_WORKSPACE/build/downstream/sdk;
$CTEST_EXE --output-on-failure -C Release;
$CTEST_EXE --output-on-failure -C Debug;

- name: Test pkg-config --cflags
shell: bash
run: PKG_CONFIG_PATH="$GITHUB_WORKSPACE/install/lib/pkgconfig" pkg-config OpenCL --cflags | grep -q "\-I$GITHUB_WORKSPACE/install/include"

- name: Test pkg-config --libs
shell: bash
run: PKG_CONFIG_PATH="$GITHUB_WORKSPACE/install/lib/pkgconfig" pkg-config OpenCL --libs | grep -q "\-L$GITHUB_WORKSPACE/install/lib -lOpenCL"

- name: Consume pkg-config
shell: bash
run: ln -s $GITHUB_WORKSPACE/external/OpenCL-Headers/install/include $GITHUB_WORKSPACE/install/include;
PKG_CONFIG_PATH="$GITHUB_WORKSPACE/install/lib/pkgconfig" $CMAKE_EXE
-G "${{matrix.GEN}}"
-D CMAKE_C_COMPILER=${{matrix.COMPILER}}
-D CMAKE_C_FLAGS="-Wall -Wextra -pedantic -m${{matrix.BIN}}"
-D CMAKE_C_STANDARD=${{matrix.STD}}
-D CMAKE_C_EXTENSIONS=${{matrix.EXT}}
-D DRIVER_STUB_PATH=$GITHUB_WORKSPACE/build/Release/libOpenCLDriverStub.so
-B $GITHUB_WORKSPACE/build/downstream/pkgconfig
-S $GITHUB_WORKSPACE/test/pkgconfig/pkgconfig;
$CMAKE_EXE --build $GITHUB_WORKSPACE/build/downstream/pkgconfig --config Release;
$CMAKE_EXE --build $GITHUB_WORKSPACE/build/downstream/pkgconfig --config Debug;
cd $GITHUB_WORKSPACE/build/downstream/pkgconfig;
$CTEST_EXE --output-on-failure -C Release;
$CTEST_EXE --output-on-failure -C Debug;
28 changes: 27 additions & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,30 @@ jobs:
if: matrix.GEN == 'Ninja Multi-Config'
shell: bash
run: |
cmake --build $GITHUB_WORKSPACE/build --config Release --target install
cmake --build $GITHUB_WORKSPACE/build --config Release --target install

- name: Test pkg-config --cflags
shell: bash
run: PKG_CONFIG_PATH="$GITHUB_WORKSPACE/install/lib/pkgconfig" pkg-config OpenCL --cflags | grep -q "\-I$GITHUB_WORKSPACE/install/include"

- name: Test pkg-config --libs
shell: bash
run: PKG_CONFIG_PATH="$GITHUB_WORKSPACE/install/lib/pkgconfig" pkg-config OpenCL --libs | grep -q "\-L$GITHUB_WORKSPACE/install/lib -lOpenCL"

- name: Consume pkg-config
shell: bash
run: ln -s $GITHUB_WORKSPACE/external/OpenCL-Headers/install/include $GITHUB_WORKSPACE/install/include;
PKG_CONFIG_PATH="$GITHUB_WORKSPACE/install/lib/pkgconfig" cmake
-G "${{matrix.GEN}}"
-D CMAKE_C_FLAGS="-Wall -Wextra -pedantic -Wno-format"
-D CMAKE_C_COMPILER=/usr/local/bin/gcc-${{matrix.VER}}
-D CMAKE_C_STANDARD=${{matrix.STD}}
-D CMAKE_C_EXTENSIONS=${{matrix.EXT}}
-D DRIVER_STUB_PATH=$GITHUB_WORKSPACE/build/Release/libOpenCLDriverStub.dylib
-B $GITHUB_WORKSPACE/build/downstream/pkgconfig
-S $GITHUB_WORKSPACE/test/pkgconfig/pkgconfig;
cmake --build $GITHUB_WORKSPACE/build/downstream/pkgconfig --config Release;
cmake --build $GITHUB_WORKSPACE/build/downstream/pkgconfig --config Debug;
cd $GITHUB_WORKSPACE/build/downstream/pkgconfig;
ctest --output-on-failure -C Release
ctest --output-on-failure -C Debug
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,11 @@ install (TARGETS OpenCL
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

if (NOT MSVC)
configure_file(OpenCL.pc.in OpenCL.pc @ONLY)
set(pkg_config_location ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenCL.pc
DESTINATION ${pkg_config_location})
endif()
10 changes: 10 additions & 0 deletions OpenCL.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

Name: OpenCL
Description: Khronos OpenCL ICD Loader
Version: 3.0
Copy link
Contributor

@bashbaug bashbaug Oct 10, 2022

Choose a reason for hiding this comment

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

Confirming: It's OK if this version number is different than our SOVERSION?

If so, this is another place that would be great to automate with #182!

Copy link
Contributor Author

@Kerilk Kerilk Oct 10, 2022

Choose a reason for hiding this comment

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

Confirming: It's OK if this version number is different than our SOVERSION?

This mimics what ocl-icd does here: https://github.com/OCL-dev/ocl-icd/blob/master/OpenCL.pc.in where @OPENCL_VERSION@ is currently evaluated to 3.0

If so, this is another place that would be great to automate with #182!

Indeed

Libs: -L${libdir} -lOpenCL
Cflags: -I${includedir}
55 changes: 55 additions & 0 deletions test/pkgconfig/pkgconfig/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
cmake_minimum_required(VERSION 3.1)
find_package(PkgConfig REQUIRED)

project(PkgConfigTest
LANGUAGES C
)

pkg_check_modules(OPENCL REQUIRED OpenCL)

if(CMAKE_VERSION VERSION_LESS 3.12)
link_directories("${OPENCL_LIBRARY_DIRS}")
endif()

add_executable(${PROJECT_NAME}
../pkgconfig.c
)

target_include_directories(${PROJECT_NAME}
PRIVATE
${OPENCL_INCLUDE_DIRS}
)

if(CMAKE_VERSION VERSION_LESS 3.12)
target_link_libraries(${PROJECT_NAME}
PRIVATE
${OPENCL_LIBRARIES}
)
else()
target_link_libraries(${PROJECT_NAME}
PRIVATE
${OPENCL_LINK_LIBRARIES}
)
endif()

target_compile_options(${PROJECT_NAME}
PRIVATE
${OPENCL_CFLAGS_OTHER}
)

target_compile_definitions(${PROJECT_NAME}
PRIVATE
CL_TARGET_OPENCL_VERSION=120
)

include(CTest)

add_test(
NAME ${PROJECT_NAME}
COMMAND ${PROJECT_NAME}
)

set_tests_properties(${PROJECT_NAME}
PROPERTIES
ENVIRONMENT "OCL_ICD_FILENAMES=${DRIVER_STUB_PATH}"
)