Merge branch 'master' into tenum.getenum

root/aclic/misc/CMakeLists.txt

@@ -12,3 +12,9 @@ ROOTTEST_ADD_TEST(assertmyfun
 ROOTTEST_ADD_TEST(assertROOT7027
                   MACRO assertROOT7027.C
                   OUTREF assertROOT7027.ref)
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    ROOTTEST_ADD_TEST(addIncludePath
+                      MACRO addIncludePath.C
+                      COPY_TO_BUILDDIR addIncludePathTest.C addIncludePathGCCMajor.C)
+endif()

root/aclic/misc/addIncludePath.C

@@ -0,0 +1,8 @@
+int addIncludePath() {
+
+    const auto gccVersion = gInterpreter->ProcessLine(".x addIncludePathGCCMajor.C+");
+    std::string newIncludePath = "-I/usr/include/c++/";
+    newIncludePath += std::to_string(gccVersion);
+    gSystem->AddIncludePath(newIncludePath.c_str());
+    return gROOT->LoadMacro("addIncludePathTest.C+"); // returns 0 in case of success
+}

root/aclic/misc/addIncludePathGCCMajor.C

@@ -0,0 +1,4 @@
+int addIncludePathGCCMajor()
+{
+   return __GNUC__;
+}

root/aclic/misc/addIncludePathTest.C

@@ -0,0 +1,8 @@
+#include <iostream>
+
+struct Foo 
+{
+  Foo() {}
+  ~Foo() {}
+  void print() { std::cout << "Hello, I'm Foo" << std::endl; }
+};