[CMake][Exp PyROOT] Use already set 'python_dir' instead of 'python_version'

Author: maxgalli

CMakeLists.txt

@@ -96,8 +96,7 @@ endif()
 set(compression_default "zlib" CACHE STRING "" FORCE)
 
 get_filename_component(ROOT_LIBRARY_DIR "${ROOTSYS}/lib" ABSOLUTE)
-set(python_version "python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-set(ROOT_PYTHON_LIBRARY_DIR ${ROOT_LIBRARY_DIR}/${python_version})
+set(ROOT_PYTHON_LIBRARY_DIR ${ROOT_LIBRARY_DIR}/${python_dir})
 
 # Detect bitness.
 if(CMAKE_SYSTEM_PROCESSOR MATCHES amd64.*|x86_64.*|aarch64.*|ppc64.*

python/basic/CMakeLists.txt

@@ -10,7 +10,7 @@ if(ROOT_pyroot_FOUND)
                     COPY_TO_BUILDDIR DataTypes.C DataTypes.h
                     PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ DataTypes.C+
                     ENVIRONMENT CLING_STANDARD_PCH=none
-                                CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_version}/libcppyy_backend.so
+                                CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_dir}/libcppyy_backend.so
                                 ENVIRONMENT EXP_PYROOT=${exp_pyroot})
 
 
@@ -24,6 +24,6 @@ if(ROOT_pyroot_FOUND)
                     COPY_TO_BUILDDIR Overloads.C Overloads.h
                     PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ Overloads.C+
                     ENVIRONMENT CLING_STANDARD_PCH=none
-                                CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_version}/libcppyy_backend.so
+                                CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_dir}/libcppyy_backend.so
                                 ENVIRONMENT EXP_PYROOT=${exp_pyroot})
 endif()

python/cling/CMakeLists.txt

@@ -9,7 +9,7 @@ if(ROOT_pyroot_FOUND)
                     WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}
                     OUTREF PyAPITest.ref
                     ENVIRONMENT CLING_STANDARD_PCH=none
-                    CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_version}/libcppyy_backend.so)
+                    CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_dir}/libcppyy_backend.so)
 
   # TPython::LoadMacro and TPython::Import are broken in the new Cppyy
   # https://bitbucket.org/wlav/cppyy/issues/65
@@ -19,7 +19,7 @@ if(ROOT_pyroot_FOUND)
                     WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}
                     OUTREF PyClassTest.ref
                     ENVIRONMENT CLING_STANDARD_PCH=none
-                    CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_version}/libcppyy_backend.so)
+                    CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_dir}/libcppyy_backend.so)
 
   ROOTTEST_ADD_TEST(cling
                     MACRO PyROOT_clingtests.py

python/regression/CMakeLists.txt

@@ -27,6 +27,6 @@ if(ROOT_pyroot_FOUND)
                     PRECMD ${ROOT_root_CMD} -b -q -l -e gSystem->AddLinkedLibs\(\"${PYTHON_LIBRARIES}\"\)
                                                      -e .L\ root_6023.h+
                     ENVIRONMENT CLING_STANDARD_PCH=none
-                    CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_version}/libcppyy_backend.so)
+                    CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_dir}/libcppyy_backend.so)
 
 endif()

root/meta/tclass/regression/CMakeLists.txt

@@ -10,7 +10,7 @@ ROOTTEST_ADD_TEST(execNormalizationInfPy
                   MACRO execNormalizationInf.py
                   OUTREF execNormalizationInf.py.ref
 		  ENVIRONMENT CLING_STANDARD_PCH=none
-                  CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_version}/libcppyy_backend.so)
+                  CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/${python_dir}/libcppyy_backend.so)
 
 ROOTTEST_ADD_TEST(execROOT_6038
                   MACRO execROOT_6038.C