No longer attempt to remove stray files from older installations.

Author: Kasper Peeters

CMakeLists.txt

@@ -284,7 +284,7 @@ message(STATUS "Found python ${PYTHON_LIBRARIES}")
 message(STATUS "Python version is ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.")
 # We used to install in a different location; let's remove files from there
 # if we find them on install.
-set(OLD_PYTHON_SITE_PATH ${CMAKE_INSTALL_FULL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
+# set(OLD_PYTHON_SITE_PATH ${CMAKE_INSTALL_FULL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
 
 # The PYTHON_SITE_PATH variable is used throughout for installation purposes.
 if(PACKAGING_MODE AND IS_DEBIAN_PACKAGE)

core/CMakeLists.txt

@@ -429,10 +429,10 @@ add_subdirectory(packages)
 if(NOT WIN32)
    # Remove any old cadabra2.so files in the global site-wide path which may have been
    # left there from a previous install.
-   remove_file("${OLD_PYTHON_SITE_PATH}/cadabra2.${PYTHON_MOD_EXT}")
-   remove_file("${OLD_PYTHON_SITE_PATH}/cadabra2_defaults.py")
-   remove_file("${OLDER_PYTHON_SITE_PATH}/cadabra2.${PYTHON_MOD_EXT}")
-   remove_file("${OLDER_PYTHON_SITE_PATH}/cadabra2_defaults.py")
+   # remove_file("${OLD_PYTHON_SITE_PATH}/cadabra2.${PYTHON_MOD_EXT}")
+   # remove_file("${OLD_PYTHON_SITE_PATH}/cadabra2_defaults.py")
+   # remove_file("${OLDER_PYTHON_SITE_PATH}/cadabra2.${PYTHON_MOD_EXT}")
+   # remove_file("${OLDER_PYTHON_SITE_PATH}/cadabra2_defaults.py")
 endif()
 
 install_directory_permissions(${PYTHON_SITE_PATH})

core/packages/CMakeLists.txt

@@ -9,7 +9,7 @@ project(Cadabra)
 print_header("Configuring packages")
 
 set(PYTHON_CDB_PACKAGE_PATH    ${PYTHON_SITE_PATH}/cdb)
-set(OLDPYTHON_CDB_PACKAGE_PATH ${OLD_PYTHON_SITE_PATH}/cdb)
+# set(OLDPYTHON_CDB_PACKAGE_PATH ${OLD_PYTHON_SITE_PATH}/cdb)
 set(SOURCE_PACKAGEDIR          ${CMAKE_SOURCE_DIR}/core/packages/cdb)
 set(PACKAGEDIR                 ${CMAKE_BINARY_DIR}/core/packages/cdb)