Commit 69671219 authored by cyrush's avatar cyrush
Browse files

merge from 2.1RC to trunk (add force when setting install paths)

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13324 18c085ea-50e0-402c-830e-de6fd14e8384
parent dfa53fb8
......@@ -191,7 +191,10 @@
#
# Kathleen Bonnell, Fri Dec 10 14:37:15 PST 2010
# Add VISIT_3RDPARTY_VAR(VISIT_ZLIB_DIR for windows.
#
#
# Cyrus Harrison, Mon Dec 20 10:50:29 PST 2010
# Use FORCE when setting various install paths.
#
#****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
......@@ -474,19 +477,19 @@ 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")
CACHE PATH "VisIt install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_BIN ${VISIT_INSTALLED_VERSION}/bin
CACHE PATH "VisIt bin install directory")
CACHE PATH "VisIt bin install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_LIB ${VISIT_INSTALLED_VERSION}/lib
CACHE PATH "VisIt lib install directory")
CACHE PATH "VisIt lib install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_INCLUDE ${VISIT_INSTALLED_VERSION}/include
CACHE PATH "VisIt include install directory")
CACHE PATH "VisIt include install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_HELP ${VISIT_INSTALLED_VERSION}/help
CACHE PATH "VisIt help install directory")
CACHE PATH "VisIt help install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_PLUGINS ${VISIT_INSTALLED_VERSION}/plugins
CACHE PATH "VisIt plugins install directory")
CACHE PATH "VisIt plugins install directory" FORCE)
SET(VISIT_INSTALLED_VERSION_ARCHIVES ${VISIT_INSTALLED_VERSION}/archives
CACHE PATH "3rd party I/O archives install directory")
CACHE PATH "3rd party I/O archives install directory" FORCE)
IF(VISIT_RPATH_RELATIVE_TO_EXECUTABLE_PATH)
SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
......
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