Commit 24b47c17 authored by bonnell's avatar bonnell

Fix netcdf-4.1.1 libs on Windows.

Update to exodus 4.98 on Windows.\
Remove setting of preprocessor definition for EXODUSII from db xml files and xml2cmake.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13496 18c085ea-50e0-402c-830e-de6fd14e8384
parent d5208cc1
......@@ -52,7 +52,7 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(EXODUSII lib/${VISIT_MSVC_VERSION} include exoIIc)
SET_UP_THIRD_PARTY(EXODUSII lib/${VISIT_MSVC_VERSION} include exoIIv2c)
ELSE (WIN32)
SET_UP_THIRD_PARTY(EXODUSII lib inc exoIIv2c)
ENDIF (WIN32)
......@@ -134,7 +134,7 @@ VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP
##
## EXODUS
##
VISIT_OPTION_DEFAULT(VISIT_EXODUSII_DIR ${VISITHOME}/exodus-4.46)
VISIT_OPTION_DEFAULT(VISIT_EXODUSII_DIR ${VISITHOME}/exodus-4.98)
VISIT_OPTION_DEFAULT(VISIT_EXODUSII_LIBDEP NETCDF_LIBRARY_DIR netcdf ${VISIT_NETCDF_LIBDEP})
##
......
......@@ -53,10 +53,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-DEXODUSII_BUILD_SHARED_ZIBS)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${EXODUSII_LIBRARY_DIR} )
ADD_LIBRARY(IExodusDatabase ${LIBI_SOURCES})
......
......@@ -53,10 +53,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-DEXODUSII_BUILD_SHARED_ZIBS)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${EXODUSII_LIBRARY_DIR} )
ADD_LIBRARY(ITimeVaryingExodusDatabase ${LIBI_SOURCES})
......
......@@ -86,7 +86,7 @@
// with "-I" as include paths.
//
// Kathleen Bonnell, Fri May 21 14:15:23 MST 2010
// Add DLL_NETCDF, _CGNSDLL EXODUSII_BUILD_SHARED_ZIBS defines for
// Add DLL_NETCDF, _CGNSDLL EXODUSII_BUILD_SHARED_LIBS defines for
// windows projects linking with NETCDF, CGNS or EXODUSII.
//
// Kathleen Bonnell, Thu May 27 14:59:13 MST 2010
......@@ -117,6 +117,9 @@
// Eric Brugger, Fri Jan 7 13:38:59 PST 2011
// I replaced the BOXLIB2D and BOXLIB3D variables with just BOXLIB.
//
// Kathleen Bonnell, Tue Jan 11 17:06:21 MST 2011
// Removed setting EXODUSII_BUILD_SHARED_LIBS definition.
//
// ****************************************************************************
class CMakeGeneratorPlugin : public Plugin
......@@ -829,8 +832,6 @@ class CMakeGeneratorPlugin : public Plugin
out << " ADD_DEFINITIONS(-DDLL_NETCDF)" << endl;
else if(libs[i].contains("CGNS"))
out << " ADD_DEFINITIONS(-DUSE_DLL)" << endl;
else if(libs[i].contains("EXODUSII"))
out << " ADD_DEFINITIONS(-DEXODUSII_BUILD_SHARED_ZIBS)" << endl;
}
out << "ENDIF(WIN32)" << endl;
}
......
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