Rename ROOT_BINARY_DIR as a ROOT_BINDIR

Initially ROOT_BINARY_DIR is automatically generated by CMake and equal
CMAKE_BINARY_DIR. Next change is adjusting ROOT_BINARY_DIR used
in ROOTConfig.cmake for ROOT binaries as a ROOTBIN_DIR

Adding a deprecation for uncorrectly used ROOT_BINARY_DIR

cmake/modules/RootConfiguration.cmake

@@ -625,6 +625,7 @@ set(ROOT_CXX_FLAGS \"${__cxxflags}\")
 set(ROOT_C_FLAGS \"${__cflags}\")
 set(ROOT_fortran_FLAGS \"${__fflags}\")
 set(ROOT_EXE_LINKER_FLAGS \"${CMAKE_EXE_LINKER_FLAGS}\")")
+set(ROOT_BINDIR ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "")
 
 #---To be used from the binary tree--------------------------------------------------------------------------
 set(ROOT_INCLUDE_DIR_SETUP "
@@ -635,9 +636,14 @@ set(ROOT_LIBRARY_DIR_SETUP "
 # ROOT configured for use from the build tree - absolute paths are used.
 set(ROOT_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib)
 ")
-set(ROOT_BINARY_DIR_SETUP "
+set(ROOT_BINDIR_SETUP "
 # ROOT configured for use from the build tree - absolute paths are used.
-set(ROOT_BINARY_DIR ${CMAKE_BINARY_DIR}/bin)
+set(ROOT_BINDIR ${CMAKE_BINARY_DIR}/bin)
+")
+# Deprecated value ROOT_BINARY_DIR
+set(ROOT_BINARY_DIR_SETUP "
+# Deprecated value, please don't use it and use ROOT_BINDIR instead.
+set(ROOT_BINARY_DIR ${ROOT_BINDIR})
 ")
 set(ROOT_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 
@@ -662,8 +668,13 @@ set(ROOT_LIBRARY_DIR_SETUP "
 # ROOT configured for the install with relative paths, so use these
 get_filename_component(ROOT_LIBRARY_DIR \"\${_thisdir}/${ROOT_CMAKE_TO_LIB_DIR}\" ABSOLUTE)
 ")
-set(ROOT_BINARY_DIR_SETUP "
+set(ROOT_BINDIR_SETUP "
 # ROOT configured for the install with relative paths, so use these
+get_filename_component(ROOT_BINDIR \"\${_thisdir}/${ROOT_CMAKE_TO_BIN_DIR}\" ABSOLUTE)
+")
+# Deprecated value ROOT_BINARY_DIR
+set(ROOT_BINARY_DIR_SETUP "
+# Deprecated value, please don't use it and use ROOT_BINDIR instead.
 get_filename_component(ROOT_BINARY_DIR \"\${_thisdir}/${ROOT_CMAKE_TO_BIN_DIR}\" ABSOLUTE)
 ")
 set(ROOT_MODULE_PATH "\${_thisdir}/modules")

cmake/scripts/ROOTConfig.cmake.in

@@ -59,6 +59,7 @@ get_filename_component(_thisdir "${CMAKE_CURRENT_LIST_FILE}" PATH)
 #
 @ROOT_INCLUDE_DIR_SETUP@
 @ROOT_LIBRARY_DIR_SETUP@
+@ROOT_BINDIR_SETUP@
 @ROOT_BINARY_DIR_SETUP@
 
 #----------------------------------------------------------------------------
@@ -104,7 +105,7 @@ endif()
 set(ROOT_ALL_TOOLS genreflex genmap root rootcint rootcling hadd rootls rootrm rootmv rootmkdir rootcp rootdraw rootbrowse)
 foreach(_cpt ${ROOT_ALL_TOOLS})
   if(NOT ROOT_${_cpt}_CMD)
-    find_program(ROOT_${_cpt}_CMD ${_cpt} HINTS ${ROOT_BINARY_DIR})
+    find_program(ROOT_${_cpt}_CMD ${_cpt} HINTS ${ROOT_BINDIR})
     if(ROOT_${_cpt}_CMD)
       mark_as_advanced(ROOT_${_cpt}_CMD)
     endif()

test/CMakeLists.txt

@@ -27,7 +27,7 @@ include_directories(${ROOT_INCLUDE_DIRS})
 if(DEFINED ROOT_SOURCE_DIR)  # Testing using the binary tree
   include_directories(${ROOT_SOURCE_DIR}/tutorials)
   include_directories(${ROOT_SOURCE_DIR}/tmva/inc)
-  set(ROOT_root_CMD ${ROOT_BINARY_DIR}/root.exe)
+  set(ROOT_root_CMD ${ROOT_BINDIR}/root.exe)
 else()                       # Testing using an installation (assuming access to ROOT CMake modules)
   include_directories(${ROOT_INCLUDE_DIRS}/../tutorials)
   add_definitions(${ROOT_DEFINITIONS})