Commit 114ec947 authored by bonnell's avatar bonnell
Browse files

merge from 2.0RC

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10011 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7d2df200
......@@ -855,7 +855,7 @@ AddEnvironment(int useShortFileName)
ExpandEnvironmentStrings(visituserpath,expvisituserpath,512);
if (_stat(expvisituserpath, &fs) == -1)
{
mkdir(expvisituserpath);
_mkdir(expvisituserpath);
}
}
else
......@@ -865,7 +865,7 @@ AddEnvironment(int useShortFileName)
sprintf(tmpdir, "%s\\My images", expvisituserpath);
if (_stat(tmpdir, &fs) == -1)
{
mkdir(tmpdir);
_mkdir(tmpdir);
}
sprintf(tmp, "VISITUSERHOME=%s", expvisituserpath);
putenv(tmp);
......@@ -1227,7 +1227,7 @@ copy_config_files(const char *filename, void *cbData)
if (_stat(newpath, &fs) == -1)
{
mkdir(newpath);
_mkdir(newpath);
}
len = strlen(oldpath);
......
......@@ -45,6 +45,7 @@
#if defined(_WIN32)
#include <windows.h>
#include <direct.h>
#else
#include <unistd.h>
#include <sys/types.h>
......@@ -365,7 +366,7 @@ GetAndMakeUserVisItHostsDirectory()
{
std::string retval = GetUserVisItDirectory() + "hosts";
#if defined(_WIN32)
mkdir(retval.c_str());
_mkdir(retval.c_str());
#else
mkdir(retval.c_str(), 0777);
#endif
......
......@@ -43,7 +43,7 @@ VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal)
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4)
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5)
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/lib/${VISIT_MSVC_VERSION} szlibdll)
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part)
#VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part)
#VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/Mili)
......
......@@ -38,6 +38,9 @@
# Gunther H. Weber, Thu Jan 14 11:36:21 PST 2010
# Added conditional target for separate socket bridge executable.
#
# Kathleen Bonnell, Thu Feb 25 11:00:43 MST 2010
# Exclude testvcl on windows.
#
#****************************************************************************/
SET(VCL_SOURCES
......@@ -68,7 +71,9 @@ IF (VISIT_CREATE_SOCKET_RELAY_EXECUTABLE)
TARGET_LINK_LIBRARIES(visit_socket_relay visitcommon ${CMAKE_THREAD_LIBS} ${DL_LIB})
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)
ENDIF (NOT WIN32)
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Bonnell, Thu Feb 25 10:59 MST 2010
# Exclude testmds on windows.
#
#****************************************************************************/
......@@ -125,7 +127,9 @@ IF(VISIT_STATIC)
)
ENDIF(VISIT_STATIC)
IF (NOT WIN32)
ADD_EXECUTABLE(testmds EXCLUDE_FROM_ALL testmds.C LibPipelineStubs.C)
TARGET_LINK_LIBRARIES(testmds mdserverproxy mdserverrpc visitcommon avtdbatts)
VISIT_INSTALL_TARGETS(mdserver)
ENDIF (NOT WIN32)
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