Fix location of dd4hep python modules in init file

cmake/thisdd4hep.csh

-# Source this script to set up the DD4Hep installation that this script is part of.
-#
-# This script if for the csh like shells, see thisdd4hep.sh for bash like shells.
-#
-# Author: Pere Mato
-
-set ARGS=($_)
-set THIS="`dirname ${ARGS[2]}`"
-
-
-#----PATH----------------------------------------------------------------------------
-if ($?PATH) then
-   setenv PATH @CMAKE_INSTALL_PREFIX@/bin:$PATH      # Linux, ELF HP-UX
-else
-   setenv PATH @CMAKE_INSTALL_PREFIX@/bin
-endif
-
-#----LD_LIBRARY_PATH-----------------------------------------------------------------
-if ($?LD_LIBRARY_PATH) then
-   setenv LD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib:$LD_LIBRARY_PATH      # Linux, ELF HP-UX
-else
-   setenv LD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib
-endif
-
-#----DYLD_LIBRARY_PATH---------------------------------------------------------------
-if ($?DYLD_LIBRARY_PATH) then
-   setenv DYLD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib:$DYLD_LIBRARY_PATH  # Mac OS X
-else
-   setenv DYLD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@XERCESC_ROOT_DIR@/lib
-endif
-
-#----PYTHONPATH---------------------------------------------------------------
-if ($?PYTHONPATH) then
-   setenv PYTHONPATH @CMAKE_SOURCE_DIR@/DDCore/python:$PYTHONPATH
-else
-   setenv PYTHONPATH @CMAKE_SOURCE_DIR@/DDCore/python
-endif

cmake/thisdd4hep_only.csh

-# Source this script to set up the DD4Hep installation that this script is part of.
-# This version of the script has been modified to set up environment variables for
-# only DD4hep.
-#
-# This script if for the csh like shells, see thisdd4hep_only.sh for bash like shells.
-#
-# Author: Pere Mato
-
-set ARGS=($_)
-set THIS="`dirname ${ARGS[2]}`"
-
-
-#----PATH----------------------------------------------------------------------------
-if ($?PATH) then
-   setenv PATH @CMAKE_INSTALL_PREFIX@/bin:$PATH      # Linux, ELF HP-UX
-else
-   setenv PATH @CMAKE_INSTALL_PREFIX@/bin
-endif
-
-#----LD_LIBRARY_PATH-----------------------------------------------------------------
-if ($?LD_LIBRARY_PATH) then
-   setenv LD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH      # Linux, ELF HP-UX
-else
-   setenv LD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib
-endif
-
-#----DYLD_LIBRARY_PATH---------------------------------------------------------------
-if ($?DYLD_LIBRARY_PATH) then
-   setenv DYLD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:$DYLD_LIBRARY_PATH  # Mac OS X
-else
-   setenv DYLD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib
-endif
-
-#----PYTHONPATH---------------------------------------------------------------
-if ($?PYTHONPATH) then
-   setenv PYTHONPATH @CMAKE_SOURCE_DIR@/DDCore/python:$PYTHONPATH
-else
-   setenv PYTHONPATH @CMAKE_SOURCE_DIR@/DDCore/python
-endif

cmake/thisdd4hep_only.sh

@@ -70,7 +70,7 @@ dd4hep_add_path PATH       ${THIS}/bin;
 #----LIBRARY_PATH-------------------------------------------------------------
 dd4hep_add_library_path    ${THIS}/lib;
 #----PYTHONPATH---------------------------------------------------------------
-dd4hep_add_path PYTHONPATH ${THIS}/python;
+dd4hep_add_path PYTHONPATH ${THIS}/lib/python@Python_VERSION_MAJOR@.@Python_VERSION_MINOR@/site-packages;
 #----ROOT_INCLUDE_PATH--------------------------------------------------------
 dd4hep_add_path ROOT_INCLUDE_PATH ${THIS}/include;
 #-----------------------------------------------------------------------------

cmake/thisdd4hep_package.sh.in

@@ -22,7 +22,7 @@ dd4hep_parse_this ${BASH_ARGV[0]} @PackageName@;
 #----PATH---------------------------------------------------------------------
 dd4hep_add_path    PATH ${THIS}/bin;
 #----PYTHONPATH---------------------------------------------------------------
-dd4hep_add_path    PYTHONPATH ${THIS}/lib/python;
+dd4hep_add_path    PYTHONPATH ${THIS}/lib/python@Python_VERSION_MAJOR@.@Python_VERSION_MINOR@/site-packages;
 #----ROOT_INCLUDE_PATH--------------------------------------------------------
 dd4hep_add_path    ROOT_INCLUDE_PATH ${THIS}/include;
 #----LIBRARY_PATH-------------------------------------------------------------