Commit 54c19fd5 authored by bonnell's avatar bonnell

Added hdf4 and ccmio for 32-bit MSVC2012.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23909 18c085ea-50e0-402c-830e-de6fd14e8384
parent dbb69dd2
......@@ -86,12 +86,13 @@ VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide/1.2.1)
##
## JPEG
##
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()
#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()
IF(MSVC10)
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")
......@@ -133,15 +134,13 @@ ENDIF()
##
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
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.10)
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP
VTK_LIBRARY_DIRS vtkjpeg-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}
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)
......@@ -184,9 +183,7 @@ ENDIF()
##
## CCMIO
##
IF(CMAKE_CL_64 OR NOT MSVC11)
VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio/2.6.1)
ENDIF()
VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio/2.6.1)
##
## CFITSIO
......
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