diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake index a6c74fd3824fae754633216380c9bc1e9d9e07aa..8524a5fd91e058d9250a88b8e08757e4468ce77f 100644 --- a/cmake/modules/RootConfiguration.cmake +++ b/cmake/modules/RootConfiguration.cmake @@ -670,7 +670,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Exports NAMESPACE ROOT:: FILE ROOTConfig-tar #---Especial definitions for root-config et al.-------------------------------------------------------------- if(prefix STREQUAL "$(ROOTSYS)") - foreach(d prefix bindir libdir incdir etcdir mandir) + foreach(d prefix bindir libdir incdir etcdir tutdir mandir) string(REPLACE "$(ROOTSYS)" "$ROOTSYS" ${d} ${${d}}) endforeach() endif() @@ -716,6 +716,7 @@ set(bindir $ROOTSYS/bin) set(libdir $ROOTSYS/lib) set(incdir $ROOTSYS/include) set(etcdir $ROOTSYS/etc) +set(tutdir $ROOTSYS/tutorials) set(mandir $ROOTSYS/man) configure_file(${CMAKE_SOURCE_DIR}/config/root-config.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/root-config @ONLY NEWLINE_STYLE UNIX) diff --git a/config/root-config.in b/config/root-config.in index de4fa1bda8f33595543b58e14f803ad6bc2ab949..ca300474b3113666e873103b6ef51cd02081593a 100755 --- a/config/root-config.in +++ b/config/root-config.in @@ -47,6 +47,7 @@ bindir=@bindir@ libdir=@libdir@ incdir=@incdir@ etcdir=@etcdir@ +tutdir=@tutdir@ features="@features@" configargs="@configargs@" altcc="@altcc@" @@ -441,7 +442,7 @@ noldflags=no usage="\ Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]\ [--cflags] [--auxcflags] [--ldflags] [--new] [--nonew] [--libs] [--glibs]\ - [--evelibs] [--bindir] [--libdir] [--incdir] [--etcdir] [--srcdir]\ + [--evelibs] [--bindir] [--libdir] [--incdir] [--etcdir] [--tutdir] [--srcdir]\ [--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch]\ [--platform] [--config] [--features] [--ncpu] [--git-revision]\ [--python-version] [--cc] [--cxx] [--f77] [--ld ] [--help]" @@ -738,6 +739,10 @@ while test $# -gt 0; do ### output the etc directory out="$out $etcdir" ;; + --tutdir) + ### output the tutorials directory + out="$out $tutdir" + ;; --srcdir) ### output the src directory out="$out $srcdir" @@ -806,6 +811,7 @@ while test $# -gt 0; do echo " --libdir Print the library directory" echo " --incdir Print the header directory" echo " --etcdir Print the configuration directory" + echo " --tutdir Print the tutorials directory" echo " --srcdir Print the top of the original source directory" echo " --auxlibs Print auxiliary libraries" echo " --auxcflags Print auxiliary compiler flags"