Updates will be applied - 3:30pm EDT (UTC -400). No downtime expected.

Commit c0bee488 authored by bonnell's avatar bonnell

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13522 18c085ea-50e0-402c-830e-de6fd14e8384

parent 77240fed
......@@ -103,10 +103,6 @@ SET(VISIT_COMMON_INCLUDES
${VISIT_INCLUDE_DIR}/visit/common/proxybase
${VISIT_INCLUDE_DIR}/visit/common/state
${VISIT_INCLUDE_DIR}/visit/common/utility
${VISIT_INCLUDE_DIR}/visit/common/common/misc
${VISIT_INCLUDE_DIR}/visit/common/common/plugin
${VISIT_INCLUDE_DIR}/visit/common/common/state
${VISIT_INCLUDE_DIR}/visit/common/common/utility
)
# VisIt options
......
......@@ -952,7 +952,7 @@ AddEnvironment(const int useShortFileName, const int addPluginVars)
putenv(tmp);
if (addPluginVars)
{
sprintf(tmp, "VISITPLUGININSTPRI=%s\\LLNL\\VisIt", appData);
sprintf(tmp, "VISITPLUGININSTPRI=%s", appData);
putenv(tmp);
}
}
......
......@@ -120,6 +120,9 @@
// Kathleen Bonnell, Tue Jan 11 17:06:21 MST 2011
// Removed setting EXODUSII_BUILD_SHARED_LIBS definition.
//
// Kathleen Bonnell, Thu Jan 13 17:54:38 MST 2011
// Only use VISIT_PLUGIN_TARGET_FOLDER if building from dev.
//
// ****************************************************************************
class CMakeGeneratorPlugin : public Plugin
......@@ -302,8 +305,11 @@ class CMakeGeneratorPlugin : public Plugin
{
out << "PROJECT(" << name<< ")" << endl;
out << endl;
if (using_dev)
{
out << "INCLUDE(${VISIT_SOURCE_DIR}/CMake/PluginMacros.cmake)" <<endl;
out << endl;
}
out << "SET(COMMON_SOURCES" << endl;
out << name << "PluginInfo.C" << endl;
out << name << "CommonPluginInfo.C" << endl;
......@@ -491,7 +497,8 @@ class CMakeGeneratorPlugin : public Plugin
out << endl;
out << "VISIT_INSTALL_PLOT_PLUGINS(${INSTALLTARGETS})" << endl;
out << "VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})" << endl;
out << "VISIT_PLUGIN_TARGET_FOLDER(plots ${INSTALLTARGETS})" << endl;
if (using_dev)
out << "VISIT_PLUGIN_TARGET_FOLDER(plots ${INSTALLTARGETS})" << endl;
out << endl;
}
......@@ -501,8 +508,11 @@ class CMakeGeneratorPlugin : public Plugin
{
out << "PROJECT(" << name<< ")" << endl;
out << endl;
if (using_dev)
{
out << "INCLUDE(${VISIT_SOURCE_DIR}/CMake/PluginMacros.cmake)" <<endl;
out << endl;
}
out << "SET(COMMON_SOURCES" << endl;
out << name << "PluginInfo.C" << endl;
out << name << "CommonPluginInfo.C" << endl;
......@@ -666,7 +676,8 @@ class CMakeGeneratorPlugin : public Plugin
out << endl;
out << "VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS})" << endl;
out << "VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})" << endl;
out << "VISIT_PLUGIN_TARGET_FOLDER(operators ${INSTALLTARGETS})" << endl;
if (using_dev)
out << "VISIT_PLUGIN_TARGET_FOLDER(operators ${INSTALLTARGETS})" << endl;
out << endl;
}
......@@ -674,8 +685,11 @@ class CMakeGeneratorPlugin : public Plugin
{
out << "PROJECT("<<name<<")" << endl;
out << endl;
if (using_dev)
{
out << "INCLUDE(${VISIT_SOURCE_DIR}/CMake/PluginMacros.cmake)" <<endl;
out << endl;
}
out << "SET(COMMON_SOURCES" << endl;
out << ""<<name<<"PluginInfo.C" << endl;
out << ""<<name<<"CommonPluginInfo.C" << endl;
......@@ -886,7 +900,9 @@ class CMakeGeneratorPlugin : public Plugin
}
out << "VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})" << endl;
out << "VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})" << endl;
out << "VISIT_PLUGIN_TARGET_FOLDER(databases ${INSTALLTARGETS})" << endl;
if (using_dev)
out << "VISIT_PLUGIN_TARGET_FOLDER(databases ${INSTALLTARGETS})" << endl;
out << endl;
}
void WriteCMake(QTextStream &out)
......
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