ci: Add find_package testing #3870
Conversation
| # Ensure these executables run without issue | ||
| add_custom_target(test-executables ALL | ||
| COMMAND glslang::glslang-standalone --version | ||
| COMMAND glslang::spirv-remap --help |
There was a problem hiding this comment.
This is why I changed the error code to return 0 instead. Otherwise the build will fail.
I believe this is more correct regardless.
There was a problem hiding this comment.
While I don't entirely like this, spirv-remap is in the process of getting moved out of the glslang repo so this will all eventually change anyway.
| if (NOT TARGET glslang::SPVRemapper) | ||
| message(FATAL_ERROR "glslang::SPVRemapper does not exist!") | ||
| endif() |
There was a problem hiding this comment.
It's likely a good idea to write better integration code for this library. I'm not that well versed enough to do it though.
Test/find_package/example.c
Outdated
There was a problem hiding this comment.
I just took the code in the README.md for the C Functional Interface
| @@ -128,7 +128,9 @@ if(GLSLANG_ENABLE_INSTALL) | |||
| install(TARGETS SPVRemapper EXPORT glslang-targets) | |||
| endif() | |||
|
|
|||
| install(TARGETS SPIRV EXPORT glslang-targets) | |||
There was a problem hiding this comment.
find_package support was broken on Windows when BUILD_SHARED_LIBS was ON.
CMake Error at D:/a/glslang/glslang/build/install/lib/cmake/glslang/glslang-targets.cmake:117 (message):
The imported target "glslang::SPIRV" references the file
"D:/a/glslang/glslang/build/install/lib/SPIRV.lib"
but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location.
* An install or uninstall procedure did not complete successfully.
* The installation package was faulty and contained
"D:/a/glslang/glslang/build/install/lib/cmake/glslang/glslang-targets.cmake"
but not all the files it references.
Call Stack (most recent call first):
D:/a/glslang/glslang/build/install/lib/cmake/glslang/glslang-config.cmake:31 (include)
CMakeLists.txt:42 (find_package)
There was a problem hiding this comment.
Note another solution could be to just export 1 function in stub.cpp so that the .lib is generated when BUILD_SHARED_LIBS is ON. This would also keep backcompat. But makes SPIRV inconsistent with the other stub libraries.
Let me know what approach you prefer.
Fix find_package breaking on Windows when BUILD_SHARED_LIBS=ON due to SPIRV stub library. Changed exit code for spirv-remap to 0 when requesting help, to allow for better integration testing. closes KhronosGroup#3462
Fix find_package breaking on Windows when BUILD_SHARED_LIBS=ON due to SPIRV stub library.
Changed exit code for spirv-remap to 0 when requesting help, to allow for better integration testing.
closes #3462