Commit 583799c4 authored by bonnell's avatar bonnell

Added <functional> header to NetworkManager for windows builds in parallel (VS 2012 complained).

Added config-site file for my new windows 7 machine.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22569 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0e77c76b
include(${VISIT_SOURCE_DIR}/config-site/windows.cmake)
# disable some warnings
# 4244 conversion double to float etc
# 4305 truncation from 'double' to 'float', etc
# 4800 'int' forcing value to bool (performance warning)
#ADD_DEFINITIONS(/wd4244 /wd4305 /wd4800)
VISIT_OPTION_DEFAULT(VISIT_INSTALL_PROFILES_TO_HOSTS "llnl" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_INSTALL_THIRD_PARTY ON TYPE BOOL)
VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON TYPE BOOL)
SET(CMAKE_SUPPRESS_REGENERATION TRUE)
SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE)
......@@ -142,6 +142,7 @@
#include <string>
#include <vector>
#ifdef _WIN32
#include <functional>
#include <direct.h> // for _getcwd, _chdir
#else
#include <unistd.h>
......
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