Add C++ compiler to assert printed info.

The C++ linker is also printed if the CMake version is 3.29+.

Author: david-cattermole

include/mmSolver/buildConstant.h

@@ -47,7 +47,8 @@ const char* const project_git_branch();
 const char* const project_git_commit_hash_long();
 const char* const project_git_commit_hash_short();
 
-// TODO: Add compiler details.
+const char* const cxx_compiler();
+const char* const cxx_linker();
 
 const char* const maya_version();
 const char* const module_os_name();

lib/mmsolverlibs/include/mmsolverlibs/assert.h

@@ -82,6 +82,16 @@
     ::mmsolverlibs::build_info::project_git_commit_hash_short()
 #endif
 
+// Project's C++ compiler details string.
+#ifndef MMASSERT_CXX_COMPILER
+#define MMASSERT_CXX_COMPILER ::mmsolverlibs::build_info::cxx_compiler()
+#endif
+
+// Project's C++ compiler linker details string.
+#ifndef MMASSERT_CXX_LINKER
+#define MMASSERT_CXX_LINKER ::mmsolverlibs::build_info::cxx_linker()
+#endif
+
 namespace mmsolverlibs {
 namespace assert {
 
@@ -116,12 +126,17 @@ inline void ostream_add_build_info_end(std::ostream& ostream) {
     const auto project_git_branch = MMASSERT_PROJECT_GIT_BRANCH;
     const auto project_git_commit_hash_long =
         MMASSERT_PROJECT_GIT_COMMIT_HASH_LONG;
+    const auto cxx_compiler = MMASSERT_CXX_COMPILER;
+    const auto cxx_linker = MMASSERT_CXX_LINKER;
 
     ostream << "- Project: " << project_name << "\n"
             << "- Project Version: " << project_version << "\n"
             << "- Build Date-Time: " << project_build_date_time << "\n"
             << "- Git Branch: " << project_git_branch << "\n"
-            << "- Git Commit: " << project_git_commit_hash_long << std::endl;
+            << "- Git Commit: " << project_git_commit_hash_long << "\n"
+            << "- C++ Compiler: " << cxx_compiler << "\n"
+            << "- C++ Linker: " << cxx_linker
+            << std::endl;
 }
 
 }  // namespace
@@ -242,4 +257,15 @@ inline void print_todo(std::ostream& ostream, const char* file, const int line,
         std::abort();                                                     \
     } while (0)
 
+// Clean up the defines made in this file.
+#undef MMASSERT_PROJECT_NAME
+#undef MMASSERT_PROJECT_VERSION
+#undef MMASSERT_PROJECT_SOURCE_DIR
+#undef MMASSERT_PROJECT_BUILD_DATE_TIME
+#undef MMASSERT_PROJECT_GIT_BRANCH
+#undef MMASSERT_PROJECT_GIT_COMMIT_HASH_LONG
+#undef MMASSERT_PROJECT_GIT_COMMIT_HASH_SHORT
+#undef MMASSERT_CXX_COMPILER
+#undef MMASSERT_CXX_LINKER
+
 #endif  // MM_SOLVER_LIBS_ASSERT_H

lib/mmsolverlibs/include/mmsolverlibs/buildConstant.h

@@ -46,7 +46,8 @@ const char* const project_git_branch();
 const char* const project_git_commit_hash_long();
 const char* const project_git_commit_hash_short();
 
-// TODO: Add compiler details.
+const char* const cxx_compiler();
+const char* const cxx_linker();
 
 }  // namespace build_info
 }  // namespace mmsolverlibs

lib/mmsolverlibs/src/buildConstant.cpp.in

@@ -52,5 +52,17 @@ const char* const project_git_commit_hash_short() {
     return "@PROJECT_GIT_COMMIT_HASH_SHORT@";
 };
 
+const char* const cxx_compiler() {
+    return "id=@CMAKE_CXX_COMPILER_ID@ "
+           "version=@CMAKE_CXX_COMPILER_VERSION@ "
+           "standard=@CMAKE_CXX_STANDARD@ "
+           "executable='@CMAKE_CXX_COMPILER@'";
+};
+const char* const cxx_linker() {
+    return "id=@CMAKE_CXX_COMPILER_LINKER_ID@ "
+           "version=@CMAKE_CXX_COMPILER_LINKER_VERSION@ "
+           "executable='@CMAKE_CXX_COMPILER_LINKER@'";
+};
+
 }  // namespace build_info
 }  // namespace mmsolverlibs

src/mmSolver/buildConstant.cpp.in

@@ -52,6 +52,18 @@ const char* const project_git_commit_hash_short() {
     return "@PROJECT_GIT_COMMIT_HASH_SHORT@";
 };
 
+const char* const cxx_compiler() {
+    return "id=@CMAKE_CXX_COMPILER_ID@ "
+           "version=@CMAKE_CXX_COMPILER_VERSION@ "
+           "standard=@CMAKE_CXX_STANDARD@ "
+           "executable='@CMAKE_CXX_COMPILER@'";
+};
+const char* const cxx_linker() {
+    return "id=@CMAKE_CXX_COMPILER_LINKER_ID@ "
+           "version=@CMAKE_CXX_COMPILER_LINKER_VERSION@ "
+           "executable='@CMAKE_CXX_COMPILER_LINKER@'";
+};
+
 const char* const maya_version() { return "@MAYA_VERSION@"; };
 const char* const module_os_name() { return "@MODULE_OS_NAME@"; };
 const char* const module_full_name() { return "@MODULE_FULL_NAME@"; };

src/mmSolver/utilities/assert_utils.h

@@ -38,6 +38,8 @@
 #undef MMASSERT_PROJECT_GIT_BRANCH
 #undef MMASSERT_PROJECT_GIT_COMMIT_HASH_LONG
 #undef MMASSERT_PROJECT_GIT_COMMIT_HASH_SHORT
+#undef MMASSERT_CXX_COMPILER
+#undef MMASSERT_CXX_LINKER
 #define MMASSERT_PROJECT_NAME ::mmsolver::build_info::project_name()
 #define MMASSERT_PROJECT_VERSION ::mmsolver::build_info::project_version()
 #define MMASSERT_PROJECT_SOURCE_DIR ::mmsolver::build_info::project_source_dir()
@@ -48,6 +50,10 @@
     ::mmsolver::build_info::project_git_commit_hash_long()
 #define MMASSERT_PROJECT_GIT_COMMIT_HASH_SHORT \
     ::mmsolver::build_info::project_git_commit_hash_short()
+#define MMASSERT_CXX_COMPILER \
+    ::mmsolver::build_info::cxx_compiler()
+#define MMASSERT_CXX_LINKER \
+    ::mmsolver::build_info::cxx_linker()
 
 // MM Solver Libs
 #include <mmsolverlibs/assert.h>
@@ -84,5 +90,7 @@
 #undef MMASSERT_PROJECT_GIT_BRANCH
 #undef MMASSERT_PROJECT_GIT_COMMIT_HASH_LONG
 #undef MMASSERT_PROJECT_GIT_COMMIT_HASH_SHORT
+#undef MMASSERT_CXX_COMPILER
+#undef MMASSERT_CXX_LINKER
 
 #endif  // MM_SOLVER_ASSERT_UTILS_H