From 2270713d6a5e090446b22bcd34e04bbc09f042e2 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Fri, 10 Jul 2020 14:39:39 +0100 Subject: [PATCH] Fix CMake rules when nesting CMake projects `${CMAKE_SOURCE_DIR}` points to the outer project root, not the current directory. Fixes building of `glslang` when included into another CMake project. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index daf8739f36..29b39fb05a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,9 +237,9 @@ set(GLSLANG_GENERATED_INCLUDEDIR "${CMAKE_BINARY_DIR}/include") ################################################################################ # Build version information generation ################################################################################ -set(GLSLANG_CHANGES_FILE "${CMAKE_SOURCE_DIR}/CHANGES.md") -set(GLSLANG_BUILD_INFO_PY "${CMAKE_SOURCE_DIR}/build_info.py") -set(GLSLANG_BUILD_INFO_H_TMPL "${CMAKE_SOURCE_DIR}/build_info.h.tmpl") +set(GLSLANG_CHANGES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.md") +set(GLSLANG_BUILD_INFO_PY "${CMAKE_CURRENT_SOURCE_DIR}/build_info.py") +set(GLSLANG_BUILD_INFO_H_TMPL "${CMAKE_CURRENT_SOURCE_DIR}/build_info.h.tmpl") set(GLSLANG_BUILD_INFO_H "${GLSLANG_GENERATED_INCLUDEDIR}/glslang/build_info.h") # Command to build the build_info.h file