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

fix: Fixes to buildinfo queries #4150

Merged
merged 1 commit into from
Feb 20, 2024
Merged

fix: Fixes to buildinfo queries #4150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/libOpenImageIO/imageio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,16 +219,16 @@ oiio_build_compiler()
using Strutil::fmt::format;

std::string comp;
#if OIIO_GNUC_VERSION
comp = format("gcc {}.{}", __GNUC__, __GNUC_MINOR__);
#elif OIIO_CLANG_VERSION
comp = format("clang {}.{}", __clang_major__, __clang_minor__);
#elif OIIO_APPLE_CLANG_VERSION
comp = format("Apple clang {}.{}", __clang_major__, __clang_minor__);
#elif OIIO_INTEL_COMPILER
#if OIIO_INTEL_CLASSIC_COMPILER_VERSION
comp = format("Intel icc {}", OIIO_INTEL_CLASSIC_COMPILER_VERSION);
#elif OIIO_INTEL_LLVM_COMPILER
comp = format("Intel icx {}.{}", __clang_major__, __clang_minor__);
#elif OIIO_APPLE_CLANG_VERSION
comp = format("Apple clang {}.{}", __clang_major__, __clang_minor__);
#elif OIIO_CLANG_VERSION
comp = format("clang {}.{}", __clang_major__, __clang_minor__);
#elif OIIO_GNUC_VERSION
comp = format("gcc {}.{}", __GNUC__, __GNUC_MINOR__);
#elif OIIO_MSVS_VERSION
comp = format("MSVS {}", OIIO_MSVS_VERSION);
#else
Expand All @@ -242,7 +242,7 @@ static std::string
oiio_build_platform()
{
std::string platform;
#if defined(__LINUX__)
#if defined(__linux__)
platform = "Linux";
#elif defined(__APPLE__)
platform = "MacOS";
Expand Down
Loading