[core] Use automatic build tree detection for all resource directories

This follows up on a5b1ed9, using the mechanism to automatically
detect if we are in the build tree or install tree also for the other
resource directories (so far it was only implemented for the `include`
directory as a first test).

Several fallbacks and hacks can be removed because of this change, like
the `ROOTIGNOREPREFIX` variable that was needed to run ROOT in the build
tree for the tests.

Author: guitargeek

CMakeLists.txt

@@ -507,7 +507,7 @@ else()
       ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/cmake/unix/makepchinput.py
       ${CMAKE_SOURCE_DIR} . ${pyroot_legacy} ${__cling_pch}
     COMMAND
-      ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ${Python3_EXECUTABLE}
+      ${Python3_EXECUTABLE}
       ${CMAKE_SOURCE_DIR}/etc/dictpch/makepch.py etc/allDict.cxx.pch
       ${__allIncludes} -I${CMAKE_BINARY_DIR}/include -I${CMAKE_SOURCE_DIR}/core
     DEPENDS
@@ -541,10 +541,10 @@ if(runtime_cxxmodules)
   get_property(modules_idx_deps GLOBAL PROPERTY modules_idx_deps_property)
   if(WIN32)
     set(modules_idx_cmd COMMAND ${CMAKE_COMMAND} -E env PATH="${library_output_dir}\\\;%PATH%"
-                                ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
+                                ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
   else()
     set(modules_idx_cmd COMMAND ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH}
-                                ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
+                                ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
   endif()
   add_custom_command(OUTPUT ${library_output_dir}/modules.idx
                      COMMAND ${CMAKE_COMMAND} -E remove -f modules.idx modules.timestamp
@@ -570,7 +570,6 @@ if(NOT CMAKE_CROSSCOMPILING)
                     COMMAND
                       ${CMAKE_COMMAND} -E env
                       ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH}
-                      ROOTIGNOREPREFIX=1
                       ROOT_HIST=0
                       $<TARGET_FILE:root.exe> -q -b -n
                         -e ".L ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C"

cmake/modules/CheckCompiler.cmake

@@ -255,7 +255,3 @@ if(gcctoolchain)
      set(CMAKE_CXX_FLAGS "--gcc-toolchain=${gcctoolchain} ${CMAKE_CXX_FLAGS}")
   endif()
 endif()
-
-if(gnuinstall)
-  set(R__HAVE_CONFIG 1)
-endif()

cmake/modules/RootMacros.cmake

@@ -653,12 +653,12 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
   else()
     if(CMAKE_PROJECT_NAME STREQUAL ROOT)
       if(MSVC AND CMAKE_ROOTTEST_DICT)
-        set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" ${CMAKE_BINARY_DIR}/bin/rootcling.exe -rootbuild)
+        set(command ${CMAKE_BINARY_DIR}/bin/rootcling.exe -rootbuild)
       else()
         if(APPLE)
-          set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" SDKROOT=${CMAKE_OSX_SYSROOT} $<TARGET_FILE:rootcling> -rootbuild)
+          set(command ${CMAKE_COMMAND} -E env SDKROOT=${CMAKE_OSX_SYSROOT} $<TARGET_FILE:rootcling> -rootbuild)
         else()
-          set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" $<TARGET_FILE:rootcling> -rootbuild)
+          set(command $<TARGET_FILE:rootcling> -rootbuild)
         endif()
         # Modules need RConfigure.h copied into include/.
         set(ROOTCLINGDEP rootcling rconfigure)
@@ -1819,9 +1819,6 @@ function(ROOT_ADD_TEST test)
     set_property(TEST ${test} PROPERTY ENVIRONMENT ROOT_DIR=${CMAKE_BINARY_DIR})
   else()
     add_test(NAME ${test} COMMAND ${_command})
-    if (gnuinstall)
-      set_property(TEST ${test} PROPERTY ENVIRONMENT ROOTIGNOREPREFIX=1)
-    endif()
   endif()
 
   #- provided fixtures and resource lock are set here

cmake/scripts/compiledata.win32.in

@@ -5,11 +5,11 @@
 #define COMPILER "@CMAKE_CXX_COMPILER@"
 #define COMPILERVERS "@CMAKE_CXX_COMPILER_ID@ @CMAKE_CXX_COMPILER_VERSION@"
 #define COMPILERVERSSTR "@CMAKE_CXX_COMPILER_ID@ @CMAKE_CXX_COMPILER_VERSION@"
-#define MAKESHAREDLIB "cl $Opt -nologo -TP -c @CMAKE_CXX_FLAGS@ @BLDCXXFLAGS@ $IncludePath $SourceFiles -Fo$ObjectFiles && bindexplib $LibName $ObjectFiles > $BuildDir\\$LibName.def && lib -nologo -MACHINE:@MACHINE_ARCH@ -out:$BuildDir\\$LibName.lib $ObjectFiles -def:$BuildDir\\$LibName.def && link -nologo $ObjectFiles -DLL -out:$BuildDir\\$LibName.dll $BuildDir\\$LibName.exp -LIBPATH:%ROOTSYS%\\lib  $LinkedLibs libCore.lib kernel32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib && if EXIST \"$BuildDir\\$LibName.dll.manifest\" ( mt -nologo -manifest \"$BuildDir\\$LibName.dll.manifest\" \"-outputresource:$BuildDir\\$LibName.dll;2\" && del \"$BuildDir\\$LibName.dll.manifest\" )"
+#define MAKESHAREDLIB "cl $Opt -nologo -TP -c @CMAKE_CXX_FLAGS@ @BLDCXXFLAGS@ $IncludePath $SourceFiles -Fo$ObjectFiles && $BinDir\\bindexplib $LibName $ObjectFiles > $BuildDir\\$LibName.def && lib -nologo -MACHINE:@MACHINE_ARCH@ -out:$BuildDir\\$LibName.lib $ObjectFiles -def:$BuildDir\\$LibName.def && link -nologo $ObjectFiles -DLL -out:$BuildDir\\$LibName.dll $BuildDir\\$LibName.exp -LIBPATH:$LibDir $LinkedLibs libCore.lib kernel32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib && if EXIST \"$BuildDir\\$LibName.dll.manifest\" ( mt -nologo -manifest \"$BuildDir\\$LibName.dll.manifest\" \"-outputresource:$BuildDir\\$LibName.dll;2\" && del \"$BuildDir\\$LibName.dll.manifest\" )"
 #define MAKEEXE "cl -nologo -TP -Iinclude -I..\\include -c $Opt @CMAKE_CXX_FLAGS@ @BLDCXXFLAGS@ $IncludePath $SourceFiles && link -opt:ref @CMAKE_EXE_FLAGS@ $ObjectFiles $LinkedLibs advapi32.lib -out:$ExeName  && if EXIST \"$ExeName.exe.manifest\" ( mt -nologo -manifest \"$ExeName.exe.manifest\" \"-outputresource:$ExeName.exe;1\" && del \"$ExeName.exe.manifest\" )"
 #define CXXOPT "@CMAKE_CXX_FLAGS_RELEASE@ @BLDCXXFLAGS@"
 #define CXXDEBUG "@CMAKE_CXX_FLAGS_DEBUG@ @BLDCXXFLAGS@"
 #define ROOTBUILD "release"
-#define LINKEDLIBS "-LIBPATH:%ROOTSYS%\\lib libCore.lib "
+#define LINKEDLIBS "-LIBPATH:$LibDir libCore.lib "
 #define OBJEXT "obj"
 #define SOEXT "dll"

config/RConfigure.in

@@ -3,22 +3,6 @@
 
 /* Configurations file for @architecture@ */
 
-#cmakedefine R__HAVE_CONFIG
-
-#ifdef R__HAVE_CONFIG
-#define ROOTPREFIX    "@prefix@"
-#define ROOTBINDIR    "@bindir@"
-#define ROOTLIBDIR    "@libdir@"
-#define ROOTETCDIR    "@etcdir@"
-#define ROOTDATADIR   "@datadir@"
-#define ROOTDOCDIR    "@docdir@"
-#define ROOTMACRODIR  "@macrodir@"
-#define ROOTTUTDIR    "@tutdir@"
-#define ROOTSRCDIR    "@srcdir@"
-#define ROOTICONPATH  "@iconpath@"
-#define TTFFONTDIR    "@ttffontdir@"
-#endif
-
 #define EXTRAICONPATH "@extraiconpath@"
 
 #define ROOT__cplusplus @__cplusplus@

core/base/CMakeLists.txt

@@ -241,20 +241,48 @@ endif()
 
 # Absolue CMAKE_INSTALL_<dir> paths are discouraged in CMake, but some
 # packagers use them anyway. So we support it.
-if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR})
-  set(install_lib_to_include "${CMAKE_INSTALL_INCLUDEDIR}")
-else()
-  if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
-    set(libdir "${CMAKE_INSTALL_LIBDIR}")
+
+function(install_path_from_libdir out_var install_dir)
+  if(IS_ABSOLUTE "${install_dir}")
+    set(install_dir_absolute "${install_dir}")
   else()
-    set(libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+    set(install_dir_absolute "${CMAKE_INSTALL_PREFIX}/${install_dir}")
   endif()
-  file(RELATIVE_PATH install_lib_to_include "${libdir}" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-  unset(libdir)
+  file(RELATIVE_PATH _rel "${libdir}" "${install_dir_absolute}")
+  set("${out_var}" "${_rel}" PARENT_SCOPE)
+endfunction()
+
+if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
+  set(libdir "${CMAKE_INSTALL_LIBDIR}")
+else()
+  set(libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 endif()
 
+install_path_from_libdir(install_lib_to_bin        "${CMAKE_INSTALL_BINDIR}")
+install_path_from_libdir(install_lib_to_data       "${CMAKE_INSTALL_DATADIR}")
+install_path_from_libdir(install_lib_to_docs       "${CMAKE_INSTALL_DOCDIR}")
+install_path_from_libdir(install_lib_to_etc        "${CMAKE_INSTALL_SYSCONFDIR}")
+install_path_from_libdir(install_lib_to_fonts      "${CMAKE_INSTALL_FONTDIR}")
+install_path_from_libdir(install_lib_to_icons      "${CMAKE_INSTALL_ICONDIR}")
+install_path_from_libdir(install_lib_to_include    "${CMAKE_INSTALL_INCLUDEDIR}")
+install_path_from_libdir(install_lib_to_macros     "${CMAKE_INSTALL_MACRODIR}")
+install_path_from_libdir(install_lib_to_rootsys    "${CMAKE_INSTALL_PREFIX}")
+install_path_from_libdir(install_lib_to_src        "${CMAKE_INSTALL_SRCDIR}")
+install_path_from_libdir(install_lib_to_tutorials  "${CMAKE_INSTALL_TUTDIR}")
+
+unset(libdir)
+
 target_compile_options(Core PRIVATE -DLIB_CORE_NAME=${full_core_filename}
+                                    -DINSTALL_LIB_TO_BIN="${install_lib_to_bin}"
+                                    -DINSTALL_LIB_TO_DATA="${install_lib_to_data}"
+                                    -DINSTALL_LIB_TO_DOCS="${install_lib_to_docs}"
+                                    -DINSTALL_LIB_TO_ETC="${install_lib_to_etc}"
+                                    -DINSTALL_LIB_TO_FONTS="${install_lib_to_fonts}"
+                                    -DINSTALL_LIB_TO_ICONS="${install_lib_to_icons}"
                                     -DINSTALL_LIB_TO_INCLUDE="${install_lib_to_include}"
+                                    -DINSTALL_LIB_TO_MACROS="${install_lib_to_macros}"
+                                    -DINSTALL_LIB_TO_ROOTSYS="${install_lib_to_rootsys}"
+                                    -DINSTALL_LIB_TO_TUTORIALS="${install_lib_to_tutorials}"
 )
 add_dependencies(Core ensure_build_tree_marker)
 

core/base/inc/TROOT.h

@@ -397,6 +397,21 @@ namespace ROOT {
       inline Bool_t RequiresCleanup(TObject &obj) {
          return obj.TestBit(kIsReferenced) && obj.GetUniqueID() == 0;
       }
+
+      struct ResourceDirs {
+         TString bin;
+         TString data;
+         TString docs;
+         TString etc;
+         TString fonts;
+         TString icons;
+         TString include;
+         TString macros;
+         TString rootsys;
+         TString tutorials;
+      };
+
+      ResourceDirs const &GetResourceDirs();
    }
 
    /// \brief call RecursiveRemove for obj if gROOT is valid