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.

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

Export config files for pkg-config. (#392) #581

Merged
merged 1 commit into from
Apr 4, 2019

Conversation

fjhenigman
Copy link
Contributor

Extracts the current version from the file CHANGES

The -dev suffix maps to a minor version number of .0
No -dev suffix maps to a minor version number of .1

Uses a first class target spirv-tools-pkg-config

Stolen from SPIRV-Tools.

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

Copy link
Collaborator

Choose a reason for hiding this comment

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

If this file differs from the SPIRV-Tools version, then you'd have to say that this has been modified from the original, as per Apache 2.0 clause 4b
http://www.apache.org/licenses/LICENSE-2.0

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it doesn't

includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

Name: shaderc
Description: Tools for Vulkan shaders.
Copy link
Collaborator

Choose a reason for hiding this comment

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

This description is too broad, overlapping too much with SPIRV-Tools.

The Shaderc github repo summary is "A collection of tools, libraries and tests for Vulkan shader compilation."

I suggest for the purpose of these pkg.config files, shorten to: "Tools and libraries for Vulkan shader compilation."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will do

Create the following pkg-config files:
- shaderc.pc which links the shared library,
- shaderc_static.pc which links the static libraries,
- shaderc_combined.pc which links the combined library.

Extracts the current version from the file CHANGES

The -dev suffix maps to a minor version number of .0
No -dev suffix maps to a minor version number of .1

Uses a first class target spirv-tools-pkg-config

Stolen from SPIRV-Tools.
@fjhenigman fjhenigman changed the title WIP Export a config file for pkg-config. (#392) Export config files for pkg-config. (#392) Mar 31, 2019
@fjhenigman fjhenigman requested review from dj2 and dneto0 April 3, 2019 16:30
@dneto0 dneto0 merged commit 439a848 into google:master Apr 4, 2019
dneto0 added a commit to dneto0/shaderc that referenced this pull request Nov 14, 2019
Includes
7425820 Start v2019.1-dev
34c412f Finish v2019.0
7e46a09 Update CHANGES
63ab5ac Re-write environment control flags to be consistent (google#637)
538a9d2 Add ability to transform spvc input from WebGPU SPIR-V (google#631)
0b84e66 Ran 2to3 on git-sync-deps (google#636)
27bffdf Roll spirv-tools dependency (google#634)
c7b4974 Remove dead file (google#632)
5ba891a Convert spirv-cross tests to using a known failures list (google#626)
05c766a Add flag to allow filtering tests cases being run (google#625)
9f04be0 Run pyformat on utils and test scripts (google#624)
326165c Run spirv-cross tests in parallel (google#622)
08549a9 Convert to requiring Python 3 (google#621)
1475418 Change 'target' env to 'source' env in spvc API (google#610)
dce7a4b Roll glslang, spirv-tools, spirv-headers, spirv-cross (google#614)
5cf297d Spvc tests: Assemble explicitly for Vulkan1.1 env (google#615)
1defed7 Fix spvc test logging (google#616)
3ac606a Update CHANGES, switch to 2019.0-dev (google#613)
55b9f5d 1.4: GOOGLE suffix drops from certain instructions
f51af41 Fix typos in the artifacts links. (google#606)
afc69d3 Disable running re2 tests (google#603)
6805e55 Fix Windows build uploads. (google#597)
60caf55 Package and upload builds. (google#595)
59a49bc Shaderc requires Python3 (google#594)
5af3dbf Roll spirv-cross. (google#592)
ff9ae40 Satisfy gn check. (google#591)
60658b0 Fix gn build. (google#590)
439a848 Export config files for pkg-config. (google#581)
2caa40b spvc: Add MSL and HLSL tests. (google#585)
1d9383f Roll DEPS. (google#586)
7bb8a43 spvc testing: add logging. (google#583)
067a749 spvc: Add some flags. (google#579)
f7fa8ce Enable spvc test. (google#578)
4b8446f Upate python scripts work with python3. (google#569)
eb0e335 Add presubmit_clang_asan bot. (google#575)
665bbc1 Add spvc command line tool and tests. (google#571)
337d42d Remove extra .clang-format files. (google#573)
cfb65d4 Fix spvc_c_smoke_test some more. (google#574)
712cebf Fix spvc_c_smoke_test. (google#572)
6bba7fe Avoid leading dot slash in cmake target. (google#570)
94f21e8 Roll GLSLang. (google#564)

Testing: checkbuild.py on Linux; unit tests on Windows
Change-Id: Ie1b63aacac7194fe8330068e6a01c5bdf44cd321
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants