Commit f40681a3 authored by bonnell's avatar bonnell

Account for windowsbuild reorganizaton in Find modules and windows config-site files.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21958 18c085ea-50e0-402c-830e-de6fd14e8384
parent 085c4eb7
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed logic handling windows differently than other platforms.
#
#****************************************************************************/
......@@ -42,10 +44,6 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(ADIOS lib/${VISIT_MSVC_VERSION} include adiosread)
ELSE (WIN32)
SET_UP_THIRD_PARTY(ADIOS lib include adiosread)
ENDIF (WIN32)
SET_UP_THIRD_PARTY(ADIOS lib include adiosread)
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed logic handling windows differently than other platforms.
#
#****************************************************************************/
......@@ -42,10 +44,6 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(ADVIO lib/${VISIT_MSVC_VERSION} include AdvDocIO AdvFileIO AdvBase)
ELSE (WIN32)
SET_UP_THIRD_PARTY(ADVIO lib include AdvDocIO AdvFileIO AdvBase)
ENDIF (WIN32)
SET_UP_THIRD_PARTY(ADVIO lib include AdvDocIO AdvFileIO AdvBase)
......@@ -48,6 +48,9 @@
# Kathleen Bonnell, Mon Jan 17 17:24:44 MST 2011
# Don't set BOXLIB_2D/3D_LIB unless BOXLIB_FOUND.
#
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VER from Windows handling.
#
#****************************************************************************/
# Use the BOXLIB_DIR hint from the config-site .cmake file
......@@ -55,7 +58,7 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(BOXLIB lib/${VISIT_MSVC_VERSION} include BoxLib2D BoxLib3D)
SET_UP_THIRD_PARTY(BOXLIB lib include BoxLib2D BoxLib3D)
ELSE (WIN32)
SET_UP_THIRD_PARTY(BOXLIB lib include box2D box3D)
ENDIF (WIN32)
......
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed logic handling windows differently than other platforms.
#
#****************************************************************************/
......@@ -42,10 +44,5 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(CCMIO lib/${VISIT_MSVC_VERSION} include ccmio adf)
ELSE (WIN32)
SET_UP_THIRD_PARTY(CCMIO lib include ccmio adf)
ENDIF (WIN32)
SET_UP_THIRD_PARTY(CCMIO lib include ccmio adf)
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed logic handling windows differently than other platforms.
#
#****************************************************************************/
......@@ -42,10 +44,5 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(CFITSIO lib/${VISIT_MSVC_VERSION} include cfitsio)
ELSE (WIN32)
SET_UP_THIRD_PARTY(CFITSIO lib include cfitsio)
ENDIF (WIN32)
SET_UP_THIRD_PARTY(CFITSIO lib include cfitsio)
......@@ -35,7 +35,9 @@
# DAMAGE.
#
# Modifications:
#
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION from windows handling.
##
#****************************************************************************/
# Use the FASTBIT_DIR hint from the config-site .cmake file
......@@ -43,7 +45,7 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(FASTBIT lib/${VISIT_MSVC_VERSION} include fastbit)
SET_UP_THIRD_PARTY(FASTBIT lib include fastbit)
ELSE (WIN32)
IF("${VISIT_CMAKE_PLATFORM}" STREQUAL "Linux")
# Linux requires librt to resolve "clock_gettime"
......
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION from windows handling.
#
#****************************************************************************/
......@@ -43,7 +45,7 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(GLEW lib/${VISIT_MSVC_VERSION} include glew32)
SET_UP_THIRD_PARTY(GLEW lib include glew32)
ELSE (WIN32)
SET_UP_THIRD_PARTY(GLEW lib include visitGLEW)
ENDIF (WIN32)
......
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed logic handling windows differently than other platforms.
#
#****************************************************************************/
......@@ -50,8 +52,5 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(ICET lib/${VISIT_MSVC_VERSION} include icet icet_strategies icet_mpi)
ELSE (WIN32)
SET_UP_THIRD_PARTY(ICET lib include icet icet_strategies icet_mpi)
ENDIF (WIN32)
SET_UP_THIRD_PARTY(ICET lib include icet icet_strategies icet_mpi)
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION.
#
#****************************************************************************/
......@@ -43,6 +45,6 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(JPEG lib/${VISIT_MSVC_VERSION} include libjpeg)
SET_UP_THIRD_PARTY(JPEG lib include libjpeg)
ENDIF (WIN32)
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION from windows handling.
#
#****************************************************************************/
......@@ -43,7 +45,7 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(MDSPLUS lib/${VISIT_MSVC_VERSION} include MdsLib)
SET_UP_THIRD_PARTY(MDSPLUS lib include MdsLib)
ELSE (WIN32)
IF("${VISIT_CMAKE_PLATFORM}" STREQUAL "Linux")
# Linux requires librt to resolve "clock_gettime"
......
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed logic handling windows differently than other platforms.
#
#****************************************************************************/
......@@ -42,17 +44,9 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(NETCDF lib/${VISIT_MSVC_VERSION} include netcdf)
ELSE (WIN32)
SET_UP_THIRD_PARTY(NETCDF lib include netcdf)
ENDIF (WIN32)
SET_UP_THIRD_PARTY(NETCDF lib include netcdf)
SET (NETCDF_CXX_DIR ${NETCDF_DIR})
IF (WIN32)
SET_UP_THIRD_PARTY(NETCDF_CXX lib/${VISIT_MSVC_VERSION} include netcdf_c++)
ELSE (WIN32)
SET_UP_THIRD_PARTY(NETCDF_CXX lib include netcdf_c++)
ENDIF (WIN32)
SET_UP_THIRD_PARTY(NETCDF_CXX lib include netcdf_c++)
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION from windows handling.
#
#****************************************************************************/
......@@ -44,7 +46,7 @@ INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
# TODO, Windows R Support.
#SET_UP_THIRD_PARTY(R "lib/${VISIT_MSVC_VERSION};lib" include R Rblase Rlapack)
#SET_UP_THIRD_PARTY(R lib include R Rblase Rlapack)
ELSE (WIN32)
SET_UP_THIRD_PARTY(R lib include R Rblas Rlapack)
MESSAGE(STATUS "Installing R directory ${VISIT_INSTALLED_VERSION_LIB}")
......
......@@ -62,6 +62,10 @@
# Removed logic to detect version of Silo and determine if PDB Lite has
# long long support. VisIt no requires Silo 4.9 or newer and all newer
# versions have long long support in PDB Lite.
#
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION from windows handling.
#
#****************************************************************************/
# Use the SILO_DIR hint from the config-site .cmake file
......@@ -70,12 +74,12 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(SILO lib/${VISIT_MSVC_VERSION} include silohdf5)
IF(EXISTS ${SILO_DIR}/lib/${VISIT_MSVC_VERSION}/silex.exe)
SET_UP_THIRD_PARTY(SILO lib include silohdf5)
IF(EXISTS ${SILO_DIR}/lib/silex.exe)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy
${SILO_DIR}/lib/${VISIT_MSVC_VERSION}/silex.exe
${SILO_DIR}/lib/silex.exe
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ThirdParty)
INSTALL(FILES ${SILO_DIR}/lib/${VISIT_MSVC_VERSION}/silex.exe
INSTALL(FILES ${SILO_DIR}/lib/silex.exe
DESTINATION ${VISIT_INSTALLED_VERSION_BIN}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
......
......@@ -35,6 +35,8 @@
# DAMAGE.
#
# Modifications:
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION from windows handling.
#
#****************************************************************************/
......@@ -43,6 +45,6 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(SZIP lib/${VISIT_MSVC_VERSION} include szlibdll)
SET_UP_THIRD_PARTY(SZIP lib include szlibdll)
ENDIF (WIN32)
......@@ -49,13 +49,16 @@
# Removed conditional check for OSMESA SIZE LIMIT, in case something wasn't
# set up correctly during first configure pass (eg Mesa lib).
#
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION from windows handling.
#
#****************************************************************************/
# Use the VTK_DIR hint from the config-site .cmake file
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(MESA lib/${VISIT_MSVC_VERSION} include MesaGL32 osmesa32)
SET_UP_THIRD_PARTY(MESA lib include MesaGL32 osmesa32)
ELSE (WIN32)
SET_UP_THIRD_PARTY(MESA lib include OSMesa)
......
......@@ -56,7 +56,10 @@
# Brad Whitlock, Wed Apr 10 18:04:33 PDT 2013
# Fix Qt dependent libraries to include some extra frameworks. These were
# needed on a 10.8 machine.
#
#
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION from windows handling.
#
#****************************************************************************/
#
......@@ -66,7 +69,7 @@
IF(NOT "${QT_BIN}" MATCHES "OFF")
IF(WIN32)
IF(VISIT_MSVC_VERSION AND EXISTS ${QT_DIR}/lib/${VISIT_MSVC_VERSION})
IF(VISIT_MSVC_VERSION AND EXISTS ${QT_DIR}/lib)
# using VisIt's windowsbuild Qt
SET(USE_CMAKE_FIND OFF)
ELSE()
......@@ -103,9 +106,9 @@ IF(NOT "${QT_BIN}" MATCHES "OFF")
ELSE (USE_CMAKE_FIND)
# MESSAGE("QT_DIR = ${QT_DIR}")
SET(QT_INCLUDE_DIR ${QT_DIR}/include)
SET(QT_LIBRARY_DIR ${QT_DIR}/lib/${VISIT_MSVC_VERSION}
SET(QT_LIBRARY_DIR ${QT_DIR}/lib
CACHE PATH "Qt library dir" FORCE )
SET(QT_BINARY_DIR ${QT_DIR}/lib/${VISIT_MSVC_VERSION}
SET(QT_BINARY_DIR ${QT_DIR}/lib
CACHE INTERNAL "" FORCE )
SET(QT_MOC_EXECUTABLE ${QT_BINARY_DIR}/moc.exe)
......
......@@ -48,6 +48,9 @@
# IF this file finds zlib, set HAVE_ZLIB_H. CHECK_INCLUDE_FILES might not
# find it, especially on windows.
#
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Removed VISIT_MSVC_VERSION from windows handling.
#
#****************************************************************************/
# Use the ZLIB_DIR hint from the config-site .cmake file
......@@ -55,7 +58,7 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(ZLIB lib/${VISIT_MSVC_VERSION} include zlib1)
SET_UP_THIRD_PARTY(ZLIB lib include zlib1)
IF (ZLIB_FOUND)
# use full path here, instead of just lib file.
SET(ZLIB_LIB "${ZLIB_LIBRARY_DIR}/${ZLIB_LIB}" CACHE STRING "zlib library" FORCE)
......
......@@ -356,6 +356,9 @@
# Kathleen Biagas, Tue Sep 3 11:06:51 PDT 2013
# Turn off SLIVR if we aren't using GLEW.
#
# Kathleen Biagas, Tues Oct 1 09:33:47 MST 2013
# Handle reorganization of windowsbuild directory.
#
#****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
......@@ -1728,12 +1731,12 @@ ENDIF(EXISTS SVN_REVISION)
# Set up resource files for Windows applications.
#-----------------------------------------------------------------------------
IF (WIN32)
IF(EXISTS ${VISIT_WINDOWS_DIR}/resources/visit.rc)
SET(RESOURCEDIR resources)
IF(EXISTS ${VISIT_WINDOWS_DIR}/distribution/resources/visit.rc)
SET(RESOURCEDIR distribution/resources)
ELSEIF(EXISTS ${VISIT_WINDOWS_DIR}/visitresources/visit.rc)
SET(RESOURCEDIR visitresources)
ELSE()
MESSAGE(FATAL_ERROR "Cannot find visit.rc in either ${VISIT_WINDOWS_DIR}/resources or ${VISIT_WINDOWS_DIR}/visitresources")
MESSAGE(FATAL_ERROR "Cannot find visit.rc in either ${VISIT_WINDOWS_DIR}/distribution/resources or ${VISIT_WINDOWS_DIR}/visitresources")
ENDIF()
SET(VISIT_VISIT_RESOURCE_FILE ${VISIT_WINDOWS_DIR}/${RESOURCEDIR}/visit.rc)
......@@ -1753,7 +1756,7 @@ IF (WIN32)
STRING(REPLACE "." "," filteredver2 "${filteredver1}")
SET(VER_FILEVERSION "${filteredver2},0")
SET(VER_PRODUCTVERSION "${filteredver2},0")
CONFIGURE_FILE(${VISIT_WINDOWS_DIR}/resources/versionvars.rc.in
CONFIGURE_FILE(${VISIT_WINDOWS_DIR}/distribution/resources/versionvars.rc.in
${VISIT_BINARY_DIR}/include/versionvars.rc @ONLY IMMEDIATE)
ENDIF (WIN32)
......@@ -2421,16 +2424,16 @@ ELSE (NOT WIN32)
COMMAND ${MAKENSIS}
/DVISIT_SOURCE_DIR=${VSD_NATIVE}
/DINSTALL_PREFIX=${CIP_NATIVE}
${VISIT_WINDOWS_DIR}/installation/CreateDBSections.nsi
${VISIT_WINDOWS_DIR}/distribution/installation/CreateDBSections.nsi
COMMAND ${MAKENSIS}
/DVisItVersion=${VISIT_VERSION}
/DCOMPILER=${VISIT_MSVC_VERSION}
/DVISIT_SOURCE_DIR=${VSD_NATIVE}
/DINSTALL_PREFIX=${CIP_NATIVE}
/DCL_64=${CMAKE_CL_64}
${VISIT_WINDOWS_DIR}/installation/binaryinstallation.nsi
DEPENDS ${VISIT_WINDOWS_DIR}/installation/CreateDBSections.nsi
${VISIT_WINDOWS_DIR}/installation/binaryinstallation.nsi
${VISIT_WINDOWS_DIR}/distribution/installation/binaryinstallation.nsi
DEPENDS ${VISIT_WINDOWS_DIR}/distribution/installation/CreateDBSections.nsi
${VISIT_WINDOWS_DIR}/distribution/installation/binaryinstallation.nsi
)
ADD_CUSTOM_TARGET(_PACKAGE ALL DEPENDS visit${VISIT_VERSION}.exe)
ADD_CUSTOM_COMMAND(TARGET _PACKAGE PRE_BUILD
......@@ -2448,8 +2451,8 @@ ELSE (NOT WIN32)
/DVisItVersion=${VISIT_VERSION}
/DVISIT_SOURCE_DIR=${VSD_NATIVE}
/DINSTALLER_LOCATION=${VISIT_BINARY_DIR}
${VISIT_WINDOWS_DIR}/installation/sourceinstallation.nsi
DEPENDS ${VISIT_WINDOWS_DIR}/installation/sourceinstallation.nsi
${VISIT_WINDOWS_DIR}/distribution/installation/sourceinstallation.nsi
DEPENDS ${VISIT_WINDOWS_DIR}/distribution/installation/sourceinstallation.nsi
)
ADD_CUSTOM_TARGET(_SRC_PACKAGE ALL DEPENDS visitdev${VISIT_VERSION}.exe)
SET_TARGET_PROPERTIES(_SRC_PACKAGE PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
......
......@@ -2,16 +2,18 @@
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(PYTHONDIR "Python26")
SET(JPEGDIR "jpeg-6b")
SET(PYTHONVER "2.6")
SET(JPEGVER "6b")
SET(ZLIBVER "1.2.7")
IF (NOT MSVC_VERSION LESS 1700)
SET(VISIT_MSVC_VERSION "MSVC2012")
SET(PYTHONDIR "python-2.7.3")
SET(JPEGDIR "jpeg-8c")
SET(PYTHONVER "2.7.3")
SET(JPEGVER "9")
SET(ZLIBVER "1.2.8")
ELSEIF (NOT MSVC_VERSION LESS 1600)
SET(VISIT_MSVC_VERSION "MSVC2010")
SET(PYTHONDIR "python-2.7.2")
SET(JPEGDIR "jpeg-8c")
SET(PYTHONVER "2.7.2")
SET(JPEGVER "8c")
ELSEIF (NOT MSVC_VERSION LESS 1500)
SET(VISIT_MSVC_VERSION "MSVC90")
ELSEIF (NOT MSVC_VERSION LESS 1400)
......@@ -34,7 +36,7 @@ MESSAGE(STATUS "Prebuilt library directory name: ${VISIT_MSVC_VERSION}")
SET(VISIT_WINDOWS_DIR ${VISIT_SOURCE_DIR}/../windowsbuild)
get_filename_component(VISIT_WINDOWS_DIR ${VISIT_WINDOWS_DIR} ABSOLUTE)
SET(VISITHOME ${VISIT_WINDOWS_DIR}/ThirdParty)
SET(VISITHOME ${VISIT_WINDOWS_DIR}/${VISIT_MSVC_VERSION})
# Create the NSIS installer package (override default from root CMakeLists.txt
......@@ -51,24 +53,24 @@ OPTION(VISIT_MAKE_NSIS_INSTALLER "Create an installer package using NSIS." ON)
##
## VTK
##
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/6.0.0/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/6.0.0)
##
## QT
##
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt-4.8.3/lib/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt-4.8.3)
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/4.8.3/lib)
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt/4.8.3)
VISIT_OPTION_DEFAULT(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe TYPE FILEPATH)
##
## PYTHON
##
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/${PYTHONDIR}/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/${PYTHONVER})
##
## PYSIDE
##
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide-1.1.1/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide/1.1.1)
##############################################################
##
......@@ -79,17 +81,17 @@ VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide-1.1.1/${VISIT_MSVC_V
##
## JPEG
##
#VISIT_OPTION_DEFAULT(VISIT_JPEG_DIR ${VISITHOME}/${JPEGDIR})
#VISIT_OPTION_DEFAULT(VISIT_JPEG_DIR ${VISITHOME}/jpeg/${JPEGVER})
##
## SZIP
##
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip)
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.0)
##
## ZLIB
##
VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/1.2.8)
VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/${ZLIBVER})
##############################################################
##
......@@ -103,7 +105,7 @@ VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/1.2.8)
##
## HDF4
##
#VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4.2.6/${VISIT_MSVC_VERSION})
#
#VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP
# JPEG_LIBRARY_DIR libjpeg
# SZIP_LIBRARY_DIR szlibdll
......@@ -114,7 +116,7 @@ VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/1.2.8)
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5-1.8.7/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.7)
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP
SZIP_LIBRARY_DIR szlibdll
ZLIB_LIBRARY_DIR zlib1
......@@ -124,7 +126,7 @@ VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP
##
## NETCDF
##
#VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf-4.1.1)
#VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf/4.1.1)
#VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP
# HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP}
# TYPE STRING
......@@ -133,22 +135,22 @@ VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP
##
## BOXLIB
##
#VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/BoxLib-0.1.8)
#VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/BoxLib/0.1.8)
##
## CCMIO
##
#VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio)
#VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio/2.6.1)
##
## CFITSIO
##
#VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio)
#VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio/3006)
##
## CGNS
##
#VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns-3.1.3/${VISIT_MSVC_VERSION})
#VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/3.1.3)
#VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP
# HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP}
# TYPE STRING
......@@ -157,12 +159,12 @@ VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP
##
## GDAL
##
#VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.10.0/${VISIT_MSVC_VERSION})
#VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.10.0)
##
## H5PART
##
#VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part-1.6.5/${VISIT_MSVC_VERSION})
#VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.5)
#VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP
# HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP}
# TYPE STRING
......@@ -171,12 +173,12 @@ VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP
##
## MILI
##
#VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/Mili/13.1.1-patch/${VISIT_MSVC_VERSION})
#VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/Mili/13.1.1-patch)
##
## SILO
##
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo-4.9.1_x64)
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.9.1)
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP
HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP}
TYPE STRING
......@@ -185,7 +187,7 @@ VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP
##
## XDMF
##
#VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/2.1.1/${VISIT_MSVC_VERSION})
#VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/2.1.1)
#VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP
# HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP}
# VTK_LIBRARY_DIRS vtklibxml2-6.0
......
......@@ -2,18 +2,18 @@
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(PYTHONDIR "Python26")
SET(JPEGDIR "jpeg-6b")
SET(PYTHONVER "2.6")
SET(JPEGVER "6b")
SET(ZLIBVER "1.2.7")
IF (NOT MSVC_VERSION LESS 1700)
SET(VISIT_MSVC_VERSION "MSVC2012")
SET(PYTHONDIR "python-2.7.3")
SET(JPEGDIR "jpeg-8c")
SET(PYTHONVER "2.7.3")
SET(JPEGVER "9")
SET(ZLIBVER "1.2.8")
ELSEIF (NOT MSVC_VERSION LESS 1600)
SET(VISIT_MSVC_VERSION "MSVC2010")
SET(PYTHONDIR "python-2.7.2")
SET(JPEGDIR "jpeg-8c")
SET(PYTHONVER "2.7.2")
SET(JPEGVER "8c")
ELSEIF (NOT MSVC_VERSION LESS 1500)
SET(VISIT_MSVC_VERSION "MSVC90")
ELSEIF (NOT MSVC_VERSION LESS 1400)
......@@ -36,7 +36,7 @@ MESSAGE(STATUS "Prebuilt library directory name: ${VISIT_MSVC_VERSION}")
SET(VISIT_WINDOWS_DIR ${VISIT_SOURCE_DIR}/../windowsbuild)
get_filename_component(VISIT_WINDOWS_DIR ${VISIT_WINDOWS_DIR} ABSOLUTE)
SET(VISITHOME ${VISIT_WINDOWS_DIR}/ThirdParty)
SET(VISITHOME ${VISIT_WINDOWS_DIR}/${VISIT_MSVC_VERSION})
# Create the NSIS installer package (override default from root CMakeLists.txt
......@@ -53,26 +53,24 @@ OPTION(VISIT_MAKE_NSIS_INSTALLER "Create an installer package using NSIS." ON)
##
## VTK
##
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/6.0.0/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/6.0.0)
##
## QT
##
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt-4.8.3/lib/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt-4.8.3)
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/4.8.3/lib)
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt/4.8.3)
VISIT_OPTION_DEFAULT(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe TYPE FILEPATH)
##
## PYTHON
##
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR
${VISITHOME}/${PYTHONDIR}/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/${PYTHONVER})
##
## PYSIDE
##
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR
${VISITHOME}/PySide-1.1.1/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/PySide/1.1.1)
##############################################################
##
......@@ -83,12 +81,12 @@ VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR
##
## JPEG
##
VISIT_OPTION_DEFAULT(VISIT_JPEG_DIR ${VISITHOME}/${JPEGDIR})
VISIT_OPTION_DEFAULT(VISIT_JPEG_DIR ${VISITHOME}/jpeg/${JPEGVER})
##
## SZIP
##
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip)
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.0)
##
## ZLIB
......@@ -107,7 +105,7 @@ VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR ${VISITHOME}/zlib/${ZLIBVER})
##
## HDF4
##
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4.2.6/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.6)
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP
JPEG_LIBRARY_DIR libjpeg
SZIP_LIBRARY_DIR szlibdll
......@@ -118,7 +116,7 @@ VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5-1.8.7/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.7)
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP
SZIP_LIBRARY_DIR szlibdll
ZLIB_LIBRARY_DIR zlib1
......@@ -128,7 +126,7 @@ VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP
##
## NETCDF
##
VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf-4.1.1)
VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf/4.1.1)
VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP
HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP}
TYPE STRING
......@@ -137,22 +135,22 @@ VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP
##
## BOXLIB
##
VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/BoxLib-0.1.8)
VISIT_OPTION_DEFAULT(VISIT_BOXLIB_DIR ${VISITHOME}/BoxLib/0.1.8)
##
## CCMIO
##
VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio)
VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio/2.6.1)
##
## CFITSIO
##
VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio)
VISIT_OPTION_DEFAULT(VISIT_CFITSIO_DIR ${VISITHOME}/cfitsio/3006)
##
## CGNS
##
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns-3.1.3/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/3.1.3)
VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP
HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP}
TYPE STRING
......@@ -161,12 +159,12 @@ VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP
##
## GDAL
##
VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.10.0/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.10.0)
##
## H5PART
##
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part-1.6.5/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.5)
VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP
HDF5_LIBRARY_DIR hdf5dll ${VISIT_HDF5_LIBDEP}
TYPE STRING
......@@ -176,16 +174,12 @@ VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP
##
## MILI
##