Commit 56d39689 authored by bonnell's avatar bonnell
Browse files

updated windowd config-site file to point to new python

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10393 18c085ea-50e0-402c-830e-de6fd14e8384
parent d7f57486
......@@ -299,21 +299,37 @@ IF(WIN32)
CACHE PATH "Install path prefix, prepended onto install directories" FORCE)
SET(APPENDED_VISIT_VERSION_TO_INSTALL_PATH TRUE CACHE INTERNAL "")
ENDIF( NOT APPENDED_VISIT_VERSION_TO_INSTALL_PATH)
SET(VISIT_INSTALLED_VERSION_BIN ${CMAKE_INSTALL_PREFIX} CACHE PATH "VisIt bin install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_LIB ${CMAKE_INSTALL_PREFIX}/lib CACHE PATH "VisIt lib install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_INCLUDE ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "VisIt include install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_HELP ${CMAKE_INSTALL_PREFIX}/help CACHE PATH "VisIt help install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_PLUGINS ${CMAKE_INSTALL_PREFIX} CACHE PATH "VisIt plugins install directory" FORCE)
SET(VISIT_INSTALLED_VERSION ${CMAKE_INSTALL_PREFIX}
CACHE PATH "VisIt install directory")
SET(VISIT_INSTALLED_VERSION_BIN ${CMAKE_INSTALL_PREFIX}
CACHE PATH "VisIt bin install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_LIB ${CMAKE_INSTALL_PREFIX}/lib
CACHE PATH "VisIt lib install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_INCLUDE ${CMAKE_INSTALL_PREFIX}/include
CACHE PATH "VisIt include install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_HELP ${CMAKE_INSTALL_PREFIX}/help
CACHE PATH "VisIt help install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_PLUGINS ${CMAKE_INSTALL_PREFIX}
CACHE PATH "VisIt plugins install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_ARCHIVES ${CMAKE_INSTALL_PREFIX}/archives
CACHE PATH "3rd party I/O archives install directory")
ELSE(WIN32)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/DetermineVisItArchitecture.cmake)
DETERMINE_VISIT_ARCHITECTURE(VISIT_INSTALL_PLATFORM)
SET(VISIT_INSTALLED_VERSION ${VISIT_VERSION}/${VISIT_INSTALL_PLATFORM} CACHE PATH "VisIt install directory")
SET(VISIT_INSTALLED_VERSION_BIN ${VISIT_INSTALLED_VERSION}/bin CACHE PATH "VisIt bin install directory")
SET(VISIT_INSTALLED_VERSION_LIB ${VISIT_INSTALLED_VERSION}/lib CACHE PATH "VisIt lib install directory")
SET(VISIT_INSTALLED_VERSION_INCLUDE ${VISIT_INSTALLED_VERSION}/include CACHE PATH "VisIt include install directory")
SET(VISIT_INSTALLED_VERSION_HELP ${VISIT_INSTALLED_VERSION}/help CACHE PATH "VisIt help install directory")
SET(VISIT_INSTALLED_VERSION_PLUGINS ${VISIT_INSTALLED_VERSION}/plugins CACHE PATH "VisIt plugins install directory")
SET(VISIT_INSTALLED_VERSION_ARCHIVES ${VISIT_INSTALLED_VERSION}/archives CACHE PATH "3rd party I/O archives install directory")
SET(VISIT_INSTALLED_VERSION ${VISIT_VERSION}/${VISIT_INSTALL_PLATFORM}
CACHE PATH "VisIt install directory")
SET(VISIT_INSTALLED_VERSION_BIN ${VISIT_INSTALLED_VERSION}/bin
CACHE PATH "VisIt bin install directory")
SET(VISIT_INSTALLED_VERSION_LIB ${VISIT_INSTALLED_VERSION}/lib
CACHE PATH "VisIt lib install directory")
SET(VISIT_INSTALLED_VERSION_INCLUDE ${VISIT_INSTALLED_VERSION}/include
CACHE PATH "VisIt include install directory")
SET(VISIT_INSTALLED_VERSION_HELP ${VISIT_INSTALLED_VERSION}/help
CACHE PATH "VisIt help install directory")
SET(VISIT_INSTALLED_VERSION_PLUGINS ${VISIT_INSTALLED_VERSION}/plugins
CACHE PATH "VisIt plugins install directory")
SET(VISIT_INSTALLED_VERSION_ARCHIVES ${VISIT_INSTALLED_VERSION}/archives
CACHE PATH "3rd party I/O archives install directory")
IF(VISIT_RPATH_RELATIVE_TO_EXECUTABLE_PATH)
SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
......
......@@ -30,7 +30,7 @@ VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-5.0.0d/${VISIT_MSVC_VERSI
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/lib/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt)
SET(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/Python25/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/Python26/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_BOXLIB2D_DIR ${VISITHOME}/boxlib)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment