From 6ed7e7f60b3e60be2589b2aa7e812f7315493db5 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 11 Jul 2024 12:47:03 +0800 Subject: Cope with failed version parsing (#4609) * Cope with failed version parsing * Better version parsing * populate slang-tag-version with cmake * Neaten cmake --- source/slang/CMakeLists.txt | 2 ++ source/slang/slang.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt index d708bde1e..495a05f36 100644 --- a/source/slang/CMakeLists.txt +++ b/source/slang/CMakeLists.txt @@ -249,6 +249,7 @@ target_include_directories( # # Slang itself # +configure_file(${slang_SOURCE_DIR}/slang-tag-version.h.in slang-tag-version.h) slang_add_target( . ${SLANG_LIB_TYPE} @@ -266,6 +267,7 @@ slang_add_target( # slang.h is in the project root, so include that directory in the interface # for slang INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR} + INCLUDE_DIRECTORIES_PRIVATE ${CMAKE_CURRENT_BINARY_DIR} EXPORT_MACRO_PREFIX SLANG INSTALL PUBLIC_HEADERS ${slang_SOURCE_DIR}/slang*.h diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index d601dcd0e..6b7e2a254 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -47,7 +47,7 @@ #include "slang-check-impl.h" -#include "../../slang-tag-version.h" +#include "slang-tag-version.h" #include -- cgit v1.2.3