Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a combined version define in MaterialX C++ #2031

Merged
merged 5 commits into from
Oct 24, 2024
Merged

Add a combined version define in MaterialX C++ #2031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3dd8145
Adding a combined version define in MaterialX C++
ruiyang2021 Sep 27, 2024
b1f8248
Move the Version comparison test to CoreUtil.cpp
ruiyang2021 Oct 24, 2024
8541564
Add newline
jstone-lucasfilm Oct 24, 2024
8744ae9
Remove extra include
jstone-lucasfilm Oct 24, 2024
e3fe0e3
Group macros together
jstone-lucasfilm Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions source/MaterialXCore/Library.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@

#include <MaterialXCore/Generated.h>

#define MATERIALX_GENERATE_INDEX(major, minor, build) \
((((uint32_t)(major)) << 22U) | (((uint32_t)(minor)) << 12U) | ((uint32_t)(build)))
#define MATERIALX_VERSION_INDEX \
MATERIALX_GENERATE_INDEX(MATERIALX_MAJOR_VERSION, MATERIALX_MINOR_VERSION, MATERIALX_BUILD_VERSION)

/// Platform-specific macros for declaring imported and exported symbols.
#if defined(MATERIALX_BUILD_SHARED_LIBS)
#if defined(_WIN32)
Expand Down
6 changes: 6 additions & 0 deletions source/MaterialXTest/MaterialXCore/CoreUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@

namespace mx = MaterialX;

TEST_CASE("Version comparison", "[coreutil]")
{
// Test for version comparison
REQUIRE(MATERIALX_VERSION_INDEX > MATERIALX_GENERATE_INDEX(1, 38, 8));
}

TEST_CASE("String utilities", "[coreutil]")
{
std::string invalidName("test.name");
Expand Down