Commit 90231533 authored by bonnell's avatar bonnell
Browse files

Update to cgns and boxlib libs on Windows.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13109 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5b15bda9
# this section should go in its own "prepare windows type cmake file"
IF (MSVC_VERSION)
SET(ERRMSG "You have chosen a compiler version not currently supported. You will need to build all dependent 3rd party libraries with this compiler, and provide the correct locations for them.")
IF (NOT MSVC_VERSION LESS 1600)
MESSAGE(WARNING "${ERRMSG}")
ELSEIF (NOT MSVC_VERSION LESS 1500)
SET(VISIT_MSVC_VERSION "MSVC90")
ELSEIF (NOT MSVC_VERSION LESS 1400)
SET(VISIT_MSVC_VERSION "MSVC80")
ELSEIF (NOT MSVC_VERSION LESS 1310)
SET(VISIT_MSVC_VERSION "MSVC71")
ELSE (NOT MSVC_VERSION LESS 1600)
MESSAGE(SEND_ERROR "${ERRMSG}")
ENDIF (NOT MSVC_VERSION LESS 1600)
ELSE (MSVC_VERSION)
# For some reason, cmake doesnt' set MSVC_VERSION when .Net2003 compiler
# is chosen. Check a different flag.
IF (MSVC71)
SET(VISIT_MSVC_VERSION "MSVC71")
ELSE (MSVC71)
MESSAGE(SEND_ERROR "${ERRMSG}")
ENDIF (MSVC71)
ENDIF(MSVC_VERSION)
# this can be left in generic_windows.cmake, but allow user to
# have their own config-site file
IF (CMAKE_CL_64)
SET(VISIT_MSVC_VERSION "${VISIT_MSVC_VERSION}-x64")
ENDIF (CMAKE_CL_64)
SET(VISIT_WINDOWS_DIR ${VISIT_SOURCE_DIR}/../windowsbuild)
SET(VISITHOME ${VISIT_WINDOWS_DIR}/ThirdParty)
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/Mesa)
#We actually want GTE 1500
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 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 OR CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/lib/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt)
SET(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/Python26/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_BOXLIB2D_DIR ${VISITHOME}/boxlib)
VISIT_OPTION_DEFAULT(VISIT_BOXLIB3D_DIR ${VISITHOME}/boxlib)
VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio)
IF (NOT CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio)
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_EXODUSII_LIBDEP NETCDF_LIBRARY_DIR netcdf)
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_MILI_DIR ${VISITHOME}/Mili)
VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf)
IF (NOT CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo)
ELSE (NOT CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo_x64)
ENDIF (NOT CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP})
##
## Xdmf
##
IF (NOT MSVC_VERSION LESS 1400)
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP})
ENDIF (NOT MSVC_VERSION LESS 1400)
INCLUDE(${VISIT_SOURCE_DIR}/config-site/windows.cmake)
include(${VISIT_SOURCE_DIR}/config-site/windows.cmake)
# can provide overrides for windows.cmake settings below
\ No newline at end of file
# can provide overrides for windows.cmake settings below
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns-3.0.8)
......@@ -45,8 +45,8 @@ SET(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/Python26/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_BOXLIB2D_DIR ${VISITHOME}/boxlib)
VISIT_OPTION_DEFAULT(VISIT_BOXLIB3D_DIR ${VISITHOME}/boxlib)
VISIT_OPTION_DEFAULT(VISIT_BOXLIB2D_DIR ${VISITHOME}/BoxLib-2010.10.01)
VISIT_OPTION_DEFAULT(VISIT_BOXLIB3D_DIR ${VISITHOME}/BoxLib-2010.10.01)
VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio)
IF (NOT CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio)
......
......@@ -49,7 +49,7 @@ ${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_CGNSDLL)
ADD_DEFINITIONS(-DUSE_DLL)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${CGNS_LIBRARY_DIR} )
......
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