Commit 1cc463b1 authored by bonnell's avatar bonnell

Update a few libraries.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23893 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5c77b759
......@@ -45,6 +45,10 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(SZIP lib include szlibdll)
IF(SZIP_LIB_NAME)
SET_UP_THIRD_PARTY(SZIP lib include ${SZIP_LIB_NAME})
ELSE()
SET_UP_THIRD_PARTY(SZIP lib include szlibdll)
ENDIF()
ENDIF (WIN32)
......@@ -58,7 +58,11 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(ZLIB lib include zlib1)
IF(ZLIB_LIB_NAME)
SET_UP_THIRD_PARTY(ZLIB lib include ${ZLIB_LIB_NAME})
ELSE()
SET_UP_THIRD_PARTY(ZLIB lib include zlib1)
ENDIF()
IF (ZLIB_FOUND)
# use full path here, instead of just lib file.
SET(ZLIB_LIBRARY "${ZLIB_LIB}" CACHE STRING "zlib library" FORCE)
......
......@@ -2,39 +2,13 @@
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.")
MESSAGE(STATUS "MSVC_VERSION=${MSVC_VERSION}")
SET(PYTHONVER "2.6")
SET(JPEGVER "6b")
SET(ZLIBVER "1.2.7")
SET(BOXLIBVER "0.1.8")
SET(CGNSVER "3.1.3")
SET(HDF4VER "4.2.6")
SET(PYSIDEVER "1.1.1")
set(HDF4_LIBNAMES_AFFIX_DLL true CACHE INTERNAL "Is 'dll' appended to hdf4 libnames")
set(JPEG_LIBNAME_PREFIX_LIB true CACHE INTERNAL "Is 'lib' prefixed to jpeg libname")
IF (NOT MSVC_VERSION LESS 1700)
IF (MSVC11)
SET(VISIT_MSVC_VERSION "MSVC2012")
SET(PYTHONVER "2.7.5")
SET(JPEGVER "9")
set(JPEG_LIBNAME_PREFIX_LIB false CACHE INTERNAL "Is 'lib' prefixed to jpeg libname")
SET(ZLIBVER "1.2.8")
SET(BOXLIBVER "2011.04.28")
SET(CGNSVER "3.2.1")
SET(HDF4VER "4.2.9")
set(HDF4_LIBNAMES_AFFIX_DLL false CACHE INTERNAL "Is 'dll' appended to hdf4 libnames")
SET(PYSIDEVER "1.2.1")
ELSEIF (NOT MSVC_VERSION LESS 1600)
ELSEIF (MSVC10)
SET(VISIT_MSVC_VERSION "MSVC2010")
SET(PYTHONVER "2.7.5")
SET(JPEGVER "8c")
SET(PYSIDEVER "1.2.1")
ELSEIF (NOT MSVC_VERSION LESS 1500)
SET(VISIT_MSVC_VERSION "MSVC90")
ELSEIF (NOT MSVC_VERSION LESS 1400)
MESSAGE(SEND_ERROR "${ERRMSG}")
ELSE (NOT MSVC_VERSION LESS 1600)
ELSE()
MESSAGE(SEND_ERROR "${ERRMSG}")
ENDIF (NOT MSVC_VERSION LESS 1700)
ENDIF()
ELSE (MSVC_VERSION)
MESSAGE(SEND_ERROR "${ERRMSG}")
ENDIF(MSVC_VERSION)
......@@ -92,12 +66,16 @@ ENDIF()
##
## PYTHON
##
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/${PYTHONVER})
IF(MSVC11)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.6)
ELSE()
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.5)
ENDIF()
##
## PYSIDE
##
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide/${PYSIDEVER})
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide/1.2.1)
##############################################################
##
......@@ -108,17 +86,38 @@ VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide/${PYSIDEVER})
##
## JPEG
##
VISIT_OPTION_DEFAULT(VISIT_JPEG_DIR ${VISITHOME}/jpeg/${JPEGVER})
IF(MSVC11)
IF (CMAKE_CL_64)
set(JPEG_LIBNAME_PREFIX_LIB false CACHE INTERNAL "Is 'lib' prefixed to jpeg libname")
VISIT_OPTION_DEFAULT(VISIT_JPEG_DIR ${VISITHOME}/jpeg/9)
ENDIF()
ELSE()
set(JPEG_LIBNAME_PREFIX_LIB true CACHE INTERNAL "Is 'lib' prefixed to jpeg libname")
VISIT_OPTION_DEFAULT(VISIT_JPEG_DIR ${VISITHOME}/jpeg/8c)
SET(JPEGVER "8c")
ENDIF()
##
## SZIP
##
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.0)
IF(MSVC11)
SET(SZIP_LIB_NAME "szip")
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1)
ELSE()
SET(SZIP_LIB_NAME "szlibdll")
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.0)
ENDIF()
##
## ZLIB
##
VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/${ZLIBVER})
IF(MSVC11)
SET(ZLIB_LIB_NAME "zlib")
VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/1.2.8)
ELSE()
SET(ZLIB_LIB_NAME "zlib1")
VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/1.2.7)
ENDIF()
##############################################################
##
......@@ -132,13 +131,27 @@ VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/${ZLIBVER})
##
## HDF4
##
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/${HDF4VER})
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP
IF(MSVC11)
set(HDF4_LIBNAMES_AFFIX_DLL false CACHE INTERNAL "Is 'dll' appended to hdf4 libnames")
IF(CMAKE_CL_64)
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.9)
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP
JPEG_LIBRARY_DIR JPEG_LIB
SZIP_LIBRARY_DIR SZIP_LIB
ZLIB_LIBRARY_DIR ZLIB_LIBRARY
TYPE STRING
)
ENDIF()
ELSE()
set(HDF4_LIBNAMES_AFFIX_DLL true CACHE INTERNAL "Is 'dll' appended to hdf4 libnames")
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.6)
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP
JPEG_LIBRARY_DIR JPEG_LIB
SZIP_LIBRARY_DIR SZIP_LIB
ZLIB_LIBRARY_DIR ZLIB_LIBRARY
TYPE STRING
)
)
ENDIF()
##
## HDF5
......@@ -162,12 +175,18 @@ VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP
##
## BOXLIB
##
VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/BoxLib/${BOXLIBVER})
IF(MSVC11)
VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/BoxLib/2011.04.28)
ELSE()
VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/BoxLib/0.1.8)
ENDIF()
##
## CCMIO
##
VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio/2.6.1)
IF(CMAKE_CL_64 OR NOT MSVC11)
VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio/2.6.1)
ENDIF()
##
## CFITSIO
......@@ -177,7 +196,11 @@ VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio/3006)
##
## CGNS
##
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/${CGNSVER})
IF(MSVC11)
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/3.2.1)
ELSE()
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/3.1.3)
ENDIF()
VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP
HDF5_LIBRARY_DIR HDF5_LIB ${VISIT_HDF5_LIBDEP}
TYPE STRING
......@@ -191,7 +214,11 @@ VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.10.0)
##
## H5PART
##
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.5)
IF(MSVC11)
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.6)
ELSE()
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.5)
ENDIF()
VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP
HDF5_LIBRARY_DIR HDF5_LIB ${VISIT_HDF5_LIBDEP}
TYPE STRING
......@@ -201,17 +228,22 @@ VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP
##
## MILI
##
IF(CMAKE_CL_64 OR NOT MSVC11)
VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/Mili/13.1.1-patch)
ENDIF()
##
## SILO
##
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.10.0)
IF(MSVC11)
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.10.0)
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP
HDF5_LIBRARY_DIR HDF5_LIB ${VISIT_HDF5_LIBDEP}
TYPE STRING
)
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP
HDF5_LIBRARY_DIR HDF5_LIB ${VISIT_HDF5_LIBDEP}
TYPE STRING
)
ENDIF()
##
## XDMF
......
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