Commit e17a43c4 authored by bonnell's avatar bonnell
Browse files

merge from 2.0RC

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10794 18c085ea-50e0-402c-830e-de6fd14e8384
parent 754ba7db
......@@ -38,6 +38,9 @@
# Kathleen Bonnell, Wed Dec 9 15:09:03 MT 2009
# Make PDB_LIB a cached STRING, and PDB_FOUND a cached BOOL.
#
# Kathleen Bonnell, Thu Apr 8 17:17:22 MST 2010
# Add install and copy of silex for windows.
#
#****************************************************************************/
# Use the SILO_DIR hint from the config-site .cmake file
......@@ -46,9 +49,17 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(SILO lib/${VISIT_MSVC_VERSION} include silohdf5)
SET_UP_THIRD_PARTY(SILO lib/${VISIT_MSVC_VERSION} include silohdf5)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy
${SILO_DIR}/lib/${VISIT_MSVC_VERSION}/silex.exe
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ThirdParty)
INSTALL(FILES ${SILO_DIR}/lib/${VISIT_MSVC_VERSION}/silex.exe
DESTINATION ${VISIT_INSTALLED_VERSION_BIN}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
ELSE (WIN32)
SET_UP_THIRD_PARTY(SILO lib include siloh5)
SET_UP_THIRD_PARTY(SILO lib include siloh5)
ENDIF (WIN32)
# We use Silo for PDB most of the time so set up additional PDB variables.
......
......@@ -170,6 +170,7 @@ IF (WIN32)
MESSAGE(STATUS "Trying to include config-site/windows.cmake")
INCLUDE(config-site/windows.cmake)
SET(CMAKE_SKIP_RPATH ON CACHE INTERNAL "VisIt builds with rpath set." FORCE)
SET(VISIT_WIN_ICON_RESOURCE ${VISIT_WINDOWS_DIR}/resources/visitresources.rc)
ENDIF (WIN32)
#-----------------------------------------------------------------------------
......@@ -1404,21 +1405,26 @@ ELSE (NOT WIN32)
# Make sure it won't run unless specifically called.
#
IF (${MAKENSIS_FOUND})
FILE(TO_NATIVE_PATH ${VISIT_SOURCE_DIR} VSD_NATIVE)
FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX} CIP_NATIVE)
ADD_CUSTOM_COMMAND(OUTPUT visit${VISIT_VERSION}.exe
COMMAND ${MAKENSIS}
/DVISIT_SOURCE_DIR=${VISIT_SOURCE_DIR}
/DINSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
/DVISIT_SOURCE_DIR=${VSD_NATIVE}
/DINSTALL_PREFIX=${CIP_NATIVE}
${VISIT_WINDOWS_DIR}/installation/CreateDBSections.nsi
COMMAND ${MAKENSIS}
/DVisItVersion=${VISIT_VERSION}
/DCOMPILER=${VISIT_MSVC_VERSION}
/DVISIT_SOURCE_DIR=${VISIT_SOURCE_DIR}
/DINSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
/DVISIT_SOURCE_DIR=${VSD_NATIVE}
/DINSTALL_PREFIX=${CIP_NATIVE}
${VISIT_WINDOWS_DIR}/installation/binaryinstallation.nsi
DEPENDS ${VISIT_WINDOWS_DIR}/installation/CreateDBSections.nsi
${VISIT_WINDOWS_DIR}/installation/binaryinstallation.nsi
)
ADD_CUSTOM_TARGET(_PACKAGE ALL DEPENDS visit${VISIT_VERSION}.exe)
ADD_CUSTOM_COMMAND(TARGET _PACKAGE PRE_BUILD
COMMAND ${CMAKE_COMMAND} -DBUILD_TYPE=${CMAKE_CFG_INTDIR} -P cmake_install.cmake)
SET_TARGET_PROPERTIES(_PACKAGE PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
ENDIF (${MAKENSIS_FOUND})
ENDIF (NOT WIN32)
......
......@@ -133,7 +133,7 @@ ELSE (NOT WIN32)
#--------------------------------------------------------------------------
INCLUDE_DIRECTORIES(${VISIT_COMMON_INCLUDES})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
ADD_EXECUTABLE(visit_exe visit.c)
ADD_EXECUTABLE(visit_exe visit.c ${VISIT_WIN_ICON_RESOURCE})
SET_TARGET_PROPERTIES(visit_exe PROPERTIES OUTPUT_NAME visit)
SET_SOURCE_FILES_PROPERTIES(visit.c PROPERTIES LANGUAGE CXX)
TARGET_LINK_LIBRARIES(visit_exe shlwapi)
......
......@@ -1049,16 +1049,25 @@ AddEnvironment(int useShortFileName)
* Modifications:
* Kathleen Bonnell, Mon Jun 2 18:11:01 PDT 2008
* Add 'visitdev' argument. Add it to the path if not null.
*
*
* Kathleen Bonnell, Sun Feb 28 16:23:45 MST 2010
* Add visitpath and visitdev to beginning of PATH, not end. Ensure they
* don't get duplicated in the PATH string.
*
*****************************************************************************/
void
AddPath(char *tmp, const char *visitpath, const char *visitdev)
{
char *env = 0, *path, *start = tmp;
bool skiptoken;
strcpy(tmp, "PATH=");
start = path = tmp + 5;
sprintf(tmp, "PATH=%s", visitpath);
if (visitdev != 0)
sprintf(tmp, ";%s", visitdev);
start = path = tmp + strlen(tmp);
if((env = getenv("PATH")) != NULL)
{
......@@ -1073,19 +1082,19 @@ AddPath(char *tmp, const char *visitpath, const char *visitdev)
/*
* If the token does not contain "VisIt " then add it to the path.
*/
if(strstr(token, "VisIt ") == NULL)
skiptoken = false;
if (strcmp(token, visitpath) == 0)
skiptoken = true;
else if (visitdev != 0 && strcmp(token, visitdev) == 0)
skiptoken = true;
else if(strstr(token, "VisIt ") != NULL)
skiptoken = true;
if (!skiptoken)
{
int len = strlen(token);
if(path == start)
{
sprintf(path, "%s", token);
path += len;
}
else
{
sprintf(path, ";%s", token);
path += (len + 1);
}
sprintf(path, ";%s", token);
path += (len + 1);
}
/*
......@@ -1097,13 +1106,6 @@ AddPath(char *tmp, const char *visitpath, const char *visitdev)
free(env2);
}
if(path == start)
sprintf(path, "%s", visitpath);
else
sprintf(path, ";%s", visitpath);
if (visitdev != 0)
sprintf(path, ";%s", visitdev);
putenv(tmp);
}
......
......@@ -145,7 +145,7 @@ avtpipeline_ser
# engine_ser_exe_EOperator_ser = The list of operator libE libraries needed to link
# engine_ser_exe_EPlot_ser = The list of plot libE libraries needed to link
ADD_EXECUTABLE(engine_ser_exe main.C ${ENGINE_STATIC_SOURCES})
ADD_EXECUTABLE(engine_ser_exe main.C ${ENGINE_STATIC_SOURCES} ${VISIT_WIN_ICON_RESOURCE})
SET_TARGET_PROPERTIES(engine_ser_exe PROPERTIES OUTPUT_NAME engine_ser)
TARGET_LINK_LIBRARIES(engine_ser_exe
${engine_ser_exe_IDatabase}
......
......@@ -1349,6 +1349,9 @@ QvisHelpWindow::displayHome()
// Brad Whitlock, Fri Feb 18 13:35:31 PST 2005
// I made it return a bool indicating whether or not it displayed the page.
//
// Kathleen Bonnell, Thu Apr 8 17:20:52 PST 2010
// Convert file to url so it will work on windows.
//
// ****************************************************************************
bool
......@@ -1361,7 +1364,7 @@ QvisHelpWindow::displayPage(const QString &page, bool reload)
QString file(CompleteFileName(page));
if(QFile(file).exists())
{
helpBrowser->setSource(file);
helpBrowser->setSource(QUrl::fromLocalFile(file));
helpFile = page;
retval = true;
}
......
......@@ -68,7 +68,7 @@ ENDIF(VISIT_STATIC)
#****************************** The gui executable ***************************
IF(NOT APPLE)
ADD_EXECUTABLE(gui_exe main.C ${GUI_STATIC_SOURCES})
ADD_EXECUTABLE(gui_exe main.C ${GUI_STATIC_SOURCES} ${VISIT_WIN_ICON_RESOURCE})
ELSE(NOT APPLE)
SET(GUI_ICON_FILE VisItIcon.icns)
SET_SOURCE_FILES_PROPERTIES(${VISIT_SOURCE_DIR}/common/icons/${GUI_ICON_FILE} PROPERTIES
......
......@@ -63,7 +63,7 @@ ${VISIT_SOURCE_DIR}/launcher/proxy
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
ADD_EXECUTABLE(vcl ${VCL_SOURCES})
ADD_EXECUTABLE(vcl ${VCL_SOURCES} ${VISIT_WIN_ICON_RESOURCE})
TARGET_LINK_LIBRARIES(vcl vclrpc visitcommon ${CMAKE_THREAD_LIBS} ${DL_LIB})
IF (VISIT_CREATE_SOCKET_RELAY_EXECUTABLE)
......@@ -73,8 +73,7 @@ IF (VISIT_CREATE_SOCKET_RELAY_EXECUTABLE)
ENDIF (VISIT_CREATE_SOCKET_RELAY_EXECUTABLE)
IF (NOT WIN32)
ADD_EXECUTABLE(testvcl EXCLUDE_FROM_ALL testvcl.C)
TARGET_LINK_LIBRARIES(testvcl vclproxy vclrpc visitcommon ${CMAKE_THREAD_LIBS} ${DL_LIB})
VISIT_INSTALL_TARGETS(vcl)
ADD_EXECUTABLE(testvcl EXCLUDE_FROM_ALL testvcl.C)
TARGET_LINK_LIBRARIES(testvcl vclproxy vclrpc visitcommon ${CMAKE_THREAD_LIBS} ${DL_LIB})
ENDIF (NOT WIN32)
VISIT_INSTALL_TARGETS(vcl)
......@@ -98,7 +98,7 @@ ${GLEW_LIBRARY_DIR}
${ALL_THIRDPARTY_IO_LIBRARY_DIR}
)
ADD_EXECUTABLE(mdserver ${MDSERVER_SOURCES} ${MDSERVER_STATIC_SOURCES})
ADD_EXECUTABLE(mdserver ${MDSERVER_SOURCES} ${MDSERVER_STATIC_SOURCES} ${VISIT_WIN_ICON_RESOURCE})
TARGET_LINK_LIBRARIES(mdserver
${mdserver_MDatabase}
${mdserver_IDatabase}
......
......@@ -210,7 +210,7 @@ ${VIEWER_QT_LIBS}
#*************************** The viewer executable ***************************
IF(NOT APPLE)
ADD_EXECUTABLE(viewer_exe viewer.C ${VIEWER_STATIC_SOURCES})
ADD_EXECUTABLE(viewer_exe viewer.C ${VIEWER_STATIC_SOURCES} ${VISIT_WIN_ICON_RESOURCE})
ELSE(NOT APPLE)
SET(VIEWER_ICON_FILE VisItIcon.icns)
SET_SOURCE_FILES_PROPERTIES(${VISIT_SOURCE_DIR}/common/icons/${VIEWER_ICON_FILE} PROPERTIES
......
......@@ -183,6 +183,7 @@ ${PYTHON_LIBRARIES}
ADD_EXECUTABLE(cli
${COMMON_SOURCES}
${CLI_SOURCES}
${VISIT_WIN_ICON_RESOURCE}
)
TARGET_LINK_LIBRARIES(cli
${cli_IOperator}
......
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