Updates will be applied on October 27th between 12pm - 12:45pm EDT (UTC-0400). Gitlab may be slow during the maintenance window.

Commit f397e799 authored by whitlocb's avatar whitlocb
Browse files

Fix Mac install and launch issues.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10782 18c085ea-50e0-402c-830e-de6fd14e8384
parent 650f3828
......@@ -1394,7 +1394,9 @@ SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(CPACK_PACKAGE_FILE_NAME "visit${UL_VERSION}.${VISIT_INSTALL_PLATFORM}")
SET(CPACK_GENERATOR "TGZ")
SET(CPACK_STRIP_FILES TRUE)
IF(NOT APPLE)
SET(CPACK_STRIP_FILES TRUE)
ENDIF(NOT APPLE)
#ENDIF(WIN32)
INCLUDE(CPack)
ELSE (NOT WIN32)
......
......@@ -2026,7 +2026,7 @@ else # We're running a public version.
{
foreach (@supportedarchs)
{
if (-x "$visitdir/$_/bin/$exe_name")
if (-x "$visitdir/$_/bin/$exe_name" || -x "$visitdir/$_/bin/$exe_name.app")
{
$archdir = $_;
last;
......
#/Users/whitlock2/Development/visit/cmake/2.6.4/i386-apple-darwin9_gcc-4.0/bin/cmake
#/Users/whitlock2/Development/visit/cmake/2.8.0/i386-apple-darwin9_gcc-4.0/bin/cmake
##
## ./build_visit generated host.cmake
......@@ -26,7 +26,7 @@ VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/5.0.0d/${VISITARCH}/lib/vtk-
## Specify the Qt4 binary dir.
## (qmake us used to locate & setup Qt4 dependencies)
##
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/qt/4.4.3/${VISITARCH}/bin)
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/qt/4.6.1/${VISITARCH}/bin)
##
## Specify the location of the python.
......@@ -38,8 +38,8 @@ VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS "-O2 -fno-common -fexceptions")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS "-O2 -fno-common -fexceptions")
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS "-O2 -fvisibility=hidden -fno-common -fexceptions")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS "-O2 -fvisibility=hidden -fno-common -fexceptions")
##
## Parallel Build Setup.
......@@ -59,6 +59,11 @@ VISIT_OPTION_DEFAULT(VISIT_MPI_COMPILER /usr/bin/mpic++)
##
VISIT_OPTION_DEFAULT(VISIT_ADVIO_DIR ${VISITHOME}/AdvIO/1.2/${VISITARCH}/)
##
## Boxlib
##
VISIT_OPTION_DEFAULT(VISIT_BOXLIB2D_DIR ${VISITHOME}/boxlib/${VISITARCH})
##
## CFITSIO
##
......@@ -72,28 +77,34 @@ VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${VISITHOME}/cgns/2.4/${VISITARCH})
##
## Exodus
##
VISIT_OPTION_DEFAULT(VISIT_EXODUS_DIR ${VISITHOME}/exodus/4.46/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_EXODUSII_DIR ${VISITHOME}/exodus/4.46/${VISITARCH})
##
## GDAL
##
VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.3.2/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.7.1/${VISITARCH})
##
## HDF4
##
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz)
##
## H5Part
##
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.4.2/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.0/${VISITARCH})
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.2/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.4/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz)
##
## Mili
##
VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/mili/1.10.0/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/mili/1.10a/${VISITARCH})
##
## NetCDF
......@@ -113,6 +124,6 @@ VISIT_OPTION_DEFAULT(VISIT_CCMIO_DIR ${VISITHOME}/ccmio/2.6.1/${VISITARCH})
##
## Silo
##
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.7/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.7.2/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP})
......@@ -672,6 +672,9 @@ find "$dir"/$version+ -type f -exec chmod $file_permission {} \;
chmod $dir_permission "$dir"/$version+/*/bin/*
chmod $dir_permission "$dir"/$version+/bin/*
if("$os" == "darwin") then
chmod $dir_permission "$dir"/$version+/*/bin/*.app/Contents/MacOS/*
endif
#
# Set the group ownership properly
......
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