diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2024-07-11 19:52:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-11 19:52:54 +0800 |
| commit | 45baeb32a7db8930cf3dc4f32cb5fefba742c6b5 (patch) | |
| tree | 119a2677abee946ac9419c4ec2dbc05062242db7 /source/slang | |
| parent | 57742cb02b04ea973ff702b42a7e380decd4048f (diff) | |
populate slang-tag-version with cmake (#4611)
At the moment it is always "unknown"
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/slang/slang.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt index 495a05f36..40eca76a9 100644 --- a/source/slang/CMakeLists.txt +++ b/source/slang/CMakeLists.txt @@ -249,7 +249,7 @@ target_include_directories( # # Slang itself # -configure_file(${slang_SOURCE_DIR}/slang-tag-version.h.in slang-tag-version.h) +configure_file(${slang_SOURCE_DIR}/slang-tag-version.h.in slang-version-header/slang-tag-version.h) slang_add_target( . ${SLANG_LIB_TYPE} @@ -267,10 +267,10 @@ 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} + INCLUDE_DIRECTORIES_PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/slang-version-header EXPORT_MACRO_PREFIX SLANG INSTALL - PUBLIC_HEADERS ${slang_SOURCE_DIR}/slang*.h + PUBLIC_HEADERS ${slang_SOURCE_DIR}/slang*.h ${CMAKE_CURRENT_BINARY_DIR}/slang-version-header/*.h ) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index d601dcd0e..9827f9c5c 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 <sys/stat.h> @@ -124,7 +124,7 @@ namespace Slang { const char* getBuildTagString() { - if (UnownedStringSlice(SLANG_TAG_VERSION) == "unknown") + if (UnownedStringSlice(SLANG_TAG_VERSION) == "0.0.0-unknown") { // If the tag is unknown, then we will try to get the timestamp of the shared library // and use that as the version string, so that we can at least return something |