--- ParaView3/CMake/ParaViewCommon.cmake.cmake-install-prefix 2009-06-12 13:25:41.000000000 -0600 +++ ParaView3/CMake/ParaViewCommon.cmake 2009-07-22 13:22:37.286421389 -0600 @@ -121,7 +121,7 @@ IF(NOT WIN32) SET(PV_NEED_SHARED_FORWARD 1) SET(PV_EXE_SUFFIX -real) - SET(PV_EXE_INSTALL ${PV_INSTALL_LIB_DIR}) + SET(PV_EXE_INSTALL "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}") SET(PV_FORWARD_DIR_BUILD "${EXECUTABLE_OUTPUT_PATH}") SET(PV_FORWARD_DIR_INSTALL "../${PV_EXE_INSTALL}") SET(PV_FORWARD_PATH_BUILD "\"${PV_FORWARD_DIR_BUILD}\"") --- ParaView3/Servers/ServerManager/CMakeLists.txt.cmake-install-prefix 2009-05-08 12:54:32.000000000 -0600 +++ ParaView3/Servers/ServerManager/CMakeLists.txt 2009-07-22 13:25:46.164483300 -0600 @@ -1,7 +1,8 @@ PROJECT(ServerManager) # needed by vtkExportKit.cmake -SET(VTK_INSTALL_PACKAGE_DIR_CM24 ${PV_INSTALL_LIB_DIR}) +SET(VTK_INSTALL_PACKAGE_DIR_CM24 + "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}") #SET(VTK_INSTALL_PACKAGE_DIR ${PV_INSTALL_LIB_DIR}) # Any build configured headers should be added to this @@ -505,7 +506,7 @@ IF(NOT PV_INSTALL_NO_RUNTIME) INSTALL( FILES ${resourceFiles} - DESTINATION ${PV_INSTALL_LIB_DIR}/ServerManager/Resources) + DESTINATION ${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/ServerManager/Resources) ENDIF(NOT PV_INSTALL_NO_RUNTIME) # # Development --- ParaView3/Utilities/VTKPythonWrapping/CMakeLists.txt.cmake-install-prefix 2009-01-23 11:35:43.000000000 -0700 +++ ParaView3/Utilities/VTKPythonWrapping/CMakeLists.txt 2009-07-22 13:19:31.941421112 -0600 @@ -158,7 +158,7 @@ # Install the paraview module files. IF (NOT PV_INSTALL_NO_LIBRARIES) INSTALL(DIRECTORY ${PV_PYTHON_MODULE_BINARY_DIR} - DESTINATION ${PV_INSTALL_LIB_DIR} + DESTINATION "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}" COMPONENT Runtime ) ENDIF (NOT PV_INSTALL_NO_LIBRARIES) --- ParaView3/Utilities/IceT/CMakeLists.txt.cmake-install-prefix 2008-10-17 10:43:26.000000000 -0600 +++ ParaView3/Utilities/IceT/CMakeLists.txt 2009-07-22 15:02:01.183421081 -0600 @@ -152,11 +152,11 @@ # CMAKE_IMPORT_BUILD_SETTINGS(<build_file>) INCLUDE(CMakeExportBuildSettings) CMAKE_EXPORT_BUILD_SETTINGS(${ICET_BINARY_DIR}/ICETBuildSettings.cmake) -INSTALL(FILES ${ICET_BINARY_DIR}/ICETBuildSettings.cmake DESTINATION ${ICET_INSTALL_LIB_DIR}) +INSTALL(FILES ${ICET_BINARY_DIR}/ICETBuildSettings.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/${ICET_INSTALL_LIB_DIR}) # Save the library dependency graph for external projects. EXPORT_LIBRARY_DEPENDENCIES(${ICET_BINARY_DIR}/ICETLibraryDepends.cmake) -INSTALL(FILES ${ICET_BINARY_DIR}/ICETLibraryDepends.cmake DESTINATION ${ICET_INSTALL_LIB_DIR}) +INSTALL(FILES ${ICET_BINARY_DIR}/ICETLibraryDepends.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/${ICET_INSTALL_LIB_DIR}) # Save ICE-T specific configuration options. #First, configuration for build directory. @@ -186,7 +186,7 @@ SET(ICET_MPI_LIBRARY_FILE "${CMAKE_INSTALL_PREFIX}${ICET_INSTALL_LIB_DIR}/${ICET_MPI_LIBRARY_FILE}") CONFIGURE_FILE(${ICET_SOURCE_DIR}/ICETConfig.cmake.in ${ICET_LIBRARY_DIR}/ICETConfig.cmake @ONLY IMMEDIATE) -INSTALL(FILES ${ICET_SOURCE_DIR}/UseICET.cmake ${ICET_LIBRARY_DIR}/ICETConfig.cmake DESTINATION ${ICET_INSTALL_LIB_DIR}) +INSTALL(FILES ${ICET_SOURCE_DIR}/UseICET.cmake ${ICET_LIBRARY_DIR}/ICETConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/${ICET_INSTALL_LIB_DIR}) # Allow local additions to this file without CVS conflicts. INCLUDE(${ICET_BINARY_DIR}/LocalUserOptions.cmake OPTIONAL) --- ParaView3/Plugins/pvblot/CMakeLists.txt.cmake-install-prefix 2009-06-01 06:59:23.000000000 -0600 +++ ParaView3/Plugins/pvblot/CMakeLists.txt 2009-07-22 15:05:00.798421716 -0600 @@ -73,7 +73,7 @@ # installing the Python source files. INSTALL( FILES ${PYMODULES} - DESTINATION ${PV_INSTALL_LIB_DIR} + DESTINATION ${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR} ) SET(PVBLOT_PVPYTHON_EXECUTABLE "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_BIN_DIR}/pvpython${PV_EXE_SUFFIX}")