Add pkg-config files #2083
Add pkg-config files #2083
Conversation
CMakeLists.txt
Outdated
|
|
||
| if(ENABLE_OPT) | ||
| # This is always true | ||
| if(${SPIRV_TOOLS_FOUND} EQUAL 1) |
There was a problem hiding this comment.
This, or something like it, seems to have broken CMake, at least for AppVeyor.
There was a problem hiding this comment.
AppVeyor build uses Windows and does not ship pkg-config tool. I'm looking for a way to fix this. If Windows cannot be fixed, I'm going to add a check and use the provided SPIRV-Tools on it.
There was a problem hiding this comment.
I'll open a separate PR to build using system SPIRV-Tools.
danyspin97
force-pushed
the
shared_lib
branch
from
8c10b1d to
018283c
Compare
danyspin97
changed the title
|
|
| @@ -40,6 +40,9 @@ target_include_directories(SPIRV PUBLIC | |||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> | |||
| $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) | |||
|
|
|||
| set(SPIRV_NAME spirv) | |||
| set(SPIRV_VERSION 1.5) | |||
There was a problem hiding this comment.
Why is this needed? We seem to be increasing the number of random places that will need to be changed when SPIR-V is updated.
There was a problem hiding this comment.
the better way for this is create a cmake function which read from where Spirv set the version and set automagically by cmake
a example:
# Get FOO_VERSION property from 'foo/bar/file'
file(READ "foo/bar/file" versioning)
string(REGEX MATCH "FOO_MAJOR_VER ([0-9]*)" _ ${versioning})
set(version_major ${CMAKE_MATCH_1})
string(REGEX MATCH "FOO_MINOR_VER ([0-9]*)" _ ${versioning})
set(version_minor ${CMAKE_MATCH_1})
string(REGEX MATCH "FOO_BUGFIX_VER ([0-9]*)" _ ${versioning})
set(version_bugfix ${CMAKE_MATCH_1})
set(FOO_VERSION ${version_major}.${version_minor}.${version_bugfix})with this, only need set the version in one place
There was a problem hiding this comment.
It is needed to set a version in the spirv.pc file. What could be done is to pass SPIRV version from cmake to spirv.hpp.
| @@ -80,6 +80,7 @@ set(HEADERS | |||
| MachineIndependent/preprocessor/PpContext.h | |||
| MachineIndependent/preprocessor/PpTokens.h) | |||
|
|
|||
| set(VERSION 8.13.3559) | |||
There was a problem hiding this comment.
This number is already out of date...
There was a problem hiding this comment.
same as avobe. with a own cmake function can do this automagic
greetings
|
There is enough feedback here that a better alternate way is needed, so closing this one. Thanks. |
This PR is based on Fedora patch: https://src.fedoraproject.org/rpms/glslang/blob/master/f/0001-pkg-config-compatibility.patch