Commit 28b3e3cd authored by bonnell's avatar bonnell
Browse files

Add python and vtk libs for windows, built with VC 8 64 bit.

Add hdf4 libs for windows, built with VC8 & 9, 32 bit and 64 bit. Had to modify the build a bit due to issues with VC 9, so updated project files (kept for our convenience) appropriately. 
Added more windows defines for DB readers linking with HDF4.
(also discovered as necessary when compiling with VC 9).

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11510 18c085ea-50e0-402c-830e-de6fd14e8384
parent 282db702
......@@ -44,6 +44,14 @@ INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(HDF4 lib/${VISIT_MSVC_VERSION} include hd421m hm421m)
# also need platform specific includes
IF (HDF4_FOUND)
IF (CMAKE_CL_64)
SET(HDF4_INCLUDE_DIR "${HDF4_INCLUDE_DIR}/x64;${HDF4_INCLUDE_DIR}" CACHE PATH "HDF4 include directory" FORCE)
ELSE (CMAKE_CL_64)
SET(HDF4_INCLUDE_DIR "${HDF4_INCLUDE_DIR}/WIN32;${HDF4_INCLUDE_DIR}" CACHE PATH "HDF4 include directory" FORCE)
ENDIF (CMAKE_CL_64)
ENDIF (HDF4_FOUND)
ELSE (WIN32)
SET_UP_THIRD_PARTY(HDF4 lib include mfhdf df)
ENDIF (WIN32)
......@@ -37,11 +37,11 @@ SET(VISITHOME ${VISIT_WINDOWS_DIR}/ThirdParty)
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/Mesa)
#We actually want GTE 1500
IF(MSVC_VERSION GREATER 1499)
IF(MSVC_VERSION GREATER 1499 OR CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-5.0.1a/${VISIT_MSVC_VERSION}/lib/vtk-5.0)
ELSE(MSVC_VERSION GREATER 1499)
ELSE(MSVC_VERSION GREATER 1499 OR CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-5.0.0e/${VISIT_MSVC_VERSION}/lib/vtk-5.0)
ENDIF(MSVC_VERSION GREATER 1499)
ENDIF(MSVC_VERSION GREATER 1499 OR CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/lib/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt)
......@@ -58,9 +58,7 @@ ENDIF (NOT CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns)
VISIT_OPTION_DEFAULT(VISIT_EXODUSII_DIR ${VISITHOME}/exodus)
VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal)
IF (NOT CMAKE_CL_64 AND(NOT ${VISIT_MSVC_VERSION} STREQUAL "MSVC90"))
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4)
ENDIF (NOT CMAKE_CL_64 AND(NOT ${VISIT_MSVC_VERSION} STREQUAL "MSVC90"))
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)
......
......@@ -49,7 +49,7 @@ ${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-DMFHDFLIB_ -D_HDFLIB_)
ADD_DEFINITIONS(-D_HDFDLL_-D_MFHDFLIB_ -D_HDFLIB_ -DINTEL86)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF4_LIBRARY_DIR} )
......
......@@ -49,7 +49,7 @@ ${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-DMFHDFLIB_ -D_HDFLIB_)
ADD_DEFINITIONS(-D_HDFDLL_ -D_MFHDFLIB_ -D_HDFLIB_ -DINTEL86)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
......
......@@ -49,7 +49,7 @@ ${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-DMFHDFLIB_ -D_HDFLIB_)
ADD_DEFINITIONS(-D_HDFDLL_ -D_MFHDFLIB_ -D_HDFLIB_ -DINTEL86)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF4_LIBRARY_DIR} )
......
......@@ -89,6 +89,10 @@
// Add DLL_NETCDF, _CGNSDLL EXODUSII_BUILD_SHARED_ZIBS defines for
// windows projects linking with NETCDF, CGNS or EXODUSII.
//
// Kathleen Bonnell, Thu May 27 14:59:13 MST 2010
// Add some more defines for HDF4, discovered as necessary when compiling
// with Visual Studio 9.
//
// ****************************************************************************
class CMakeGeneratorPlugin : public Plugin
......@@ -747,7 +751,7 @@ class CMakeGeneratorPlugin : public Plugin
else if(libs[i].contains("HDF5"))
out << " ADD_DEFINITIONS(-D_HDF5USEDLL_)" << endl;
else if(libs[i].contains("HDF4"))
out << " ADD_DEFINITIONS(-DMFHDFLIB_ -D_HDFLIB_)" << endl;
out << " ADD_DEFINITIONS(-D_HDFDLL_ -D_MFHDFLIB_ -D_HDFLIB_ -DINTEL86)" << endl;
else if(libs[i].contains("FITS"))
out << " ADD_DEFINITIONS(-D_HDF5USEDLL_)" << endl;
else if(libs[i].contains("NETCDF"))
......
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