From 36333d1fb9f2375ca3595315e7643968aa6b3a29 Mon Sep 17 00:00:00 2001 From: David Neto Date: Tue, 19 Oct 2021 17:32:52 -0400 Subject: [PATCH] Fix Cmake rule for extension header generation Allow glslang to be embedded in an enclosing project (such as Shaderc) --- StandAlone/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index 4d5545c78..2b163e7f5 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -34,8 +34,8 @@ find_host_package(PythonInterp 3 REQUIRED) set(GLSLANG_INTRINSIC_H "${GLSLANG_GENERATED_INCLUDEDIR}/glslang/glsl_intrinsic_header.h") -set(GLSLANG_INTRINSIC_PY "${CMAKE_SOURCE_DIR}/gen_extension_headers.py") -set(GLSLANG_INTRINSIC_HEADER_DIR "${CMAKE_SOURCE_DIR}/glslang/ExtensionHeaders") +set(GLSLANG_INTRINSIC_PY "${CMAKE_CURRENT_SOURCE_DIR}/../gen_extension_headers.py") +set(GLSLANG_INTRINSIC_HEADER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../glslang/ExtensionHeaders") add_custom_command( OUTPUT ${GLSLANG_INTRINSIC_H} @@ -124,4 +124,4 @@ if(ENABLE_GLSLANG_INSTALL) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -endif() \ No newline at end of file +endif()