Merge branch 'master' into issue1579_durack1_UpdateNetcdf4.3.3.1To4.4.0

.travis.yml

@@ -1,6 +1,6 @@
 os:
  - linux
-# - osx
+ - osx
 
 language: c++
 
@@ -10,8 +10,6 @@ before_install:
  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew outdated cmake || brew upgrade cmake ; fi
  - cmake --version
 
-before_script: travis_wait
-
 script:
  - git submodule init
  - git submodule update

CMake/cdat_modules/cmor_pkg.cmake

@@ -1,5 +1,5 @@
 set(CMOR_VERSION 2.9.2)
-set(CMOR_BRANCH master)
+set(CMOR_BRANCH uvcdat-2.4.0)
 set(CMOR_REPOSITORY ${GIT_PROTOCOL}github.com/PCMDI/cmor.git )
 
 set(GIT_CMD_STR_CMOR GIT_REPOSITORY ${CMOR_REPOSITORY})

CMake/cdat_modules/cryptography_deps.cmake

@@ -1 +1 @@
-set(CRYPTOGRAPHY_deps ${python_pkg} ${pip_pkg} ${cffi_pkg})
+set(CRYPTOGRAPHY_deps ${python_pkg} ${pip_pkg} ${cffi_pkg} ${openssl_pkg})

CMake/cdat_modules/cryptography_external.cmake

@@ -3,4 +3,10 @@
 # and configure and build it
 set(nm CRYPTOGRAPHY)
 
+# Set LDFlags and CFlags to make it easier to find OpenSSL
+list(APPEND USR_ENVS
+ "LDFLAGS=-L${OPENSSL_LIBRARY_DIR} $ENV{LDFLAGS}"
+ "CFLAGS=-I${OPENSSL_INCLUDE_DIR} $ENV{CFLAGS}"
+ )
+
 include(pipinstaller)

CMake/cdat_modules/curses_external.cmake

@@ -2,14 +2,20 @@ set(curses_source "${CMAKE_CURRENT_BINARY_DIR}/build/curses")
 set(curses_install "${cdat_EXTERNALS}")
 set(curses_conf_args)
 
+configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/curses_patch_step.cmake.in
+ ${cdat_CMAKE_BINARY_DIR}/curses_patch_step.cmake
+ @ONLY)
+
+set(curses_PATCH_COMMAND ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/curses_patch_step.cmake)
+
 ExternalProject_Add(Curses
  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
  SOURCE_DIR ${curses_source}
  INSTALL_DIR ${curses_install}
  URL ${CURSES_URL}/${CURSES_GZ}
  URL_MD5 ${CURSES_MD5}
  BUILD_IN_SOURCE 1
- PATCH_COMMAND ""
+ PATCH_COMMAND ${curses_PATCH_COMMAND}
  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCONFIGURE_ARGS=${curses_conf_args} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
  DEPENDS ${curses_deps}
  ${ep_log_options}

CMake/cdat_modules/curses_pkg.cmake

@@ -1,13 +1,14 @@
 set (package Curses)
 string(TOUPPER ${package} package_uc)
 
-set(${package_uc}_MAJOR_SRC 5)
-set(${package_uc}_MINOR_SRC 9)
+set(${package_uc}_MAJOR_SRC 6)
+set(${package_uc}_MINOR_SRC 0)
 set(${package_uc}_PATCH_SRC 0)
 set(${package_uc}_URL ${LLNL_URL})
 #set(${package_uc}_GZ ncurses-${${package_uc}_MAJOR_SRC}.${${package_uc}_MINOR_SRC}.${${package_uc}_PATCH_SRC}.tar.gz)
 set(${package_uc}_GZ ncurses-${${package_uc}_MAJOR_SRC}.${${package_uc}_MINOR_SRC}.tar.gz)
-set(${package_uc}_MD5 8cb9c412e5f2d96bc6f459aa8c6282a1)
+set(${pacakge_uc}_MD5 931959c0e1a9949999407b025cf44d3d)
+#set(${package_uc}_MD5 8cb9c412e5f2d96bc6f459aa8c6282a1)
 set(${package_uc}_SOURCE ${${package_uc}_URL}/${${package_uc}_GZ})
 set(${package_uc}_MD5 ${${package_uc}_MD5})
 

CMake/cdat_modules/cycler_deps.cmake

@@ -0,0 +1 @@
+set(cycler_deps ${python_pkg} ${setuptools_pkg} ${six_pkg})

CMake/cdat_modules/cycler_external.cmake

@@ -0,0 +1,16 @@
+# Cycler
+
+set(Cycler_source "${CMAKE_CURRENT_BINARY_DIR}/build/Cycler")
+
+ExternalProject_Add(Cycler
+ DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
+ SOURCE_DIR ${Cycler_source}
+ URL ${CYCLER_URL}/${CYCLER_GZ}
+ URL_MD5 ${CYCLER_MD5}
+ BUILD_IN_SOURCE 1
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ${PYTHON_EXECUTABLE} setup.py build
+ INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install --old-and-unmanageable ${PYTHON_EXTRA_PREFIX}
+ DEPENDS ${cycler_deps}
+ ${ep_log_options}
+)

CMake/cdat_modules/cycler_pkg.cmake

@@ -0,0 +1,10 @@
+set(CYCLER_MAJOR 0)
+set(CYCLER_MINOR 9)
+set(CYCLER_PATCH 0)
+set(CYCLER_VERSION ${CYCLER_MAJOR}.${CYCLER_MINOR}.${CYCLER_PATCH})
+set(CYCLER_URL ${LLNL_URL})
+set(CYCLER_GZ cycler-${CYCLER_VERSION}.tar.gz)
+set(CYCLER_MD5 c10ade5ca3f0aadf575eb25203b225a5)
+set(CYCLER_SOURCE ${CYCLER_URL}/${CYCLER_GZ})
+
+add_cdat_package_dependent(Cycler "" "" ON "CDAT_BUILD_GRAPHICS" OFF)

CMake/cdat_modules/esmf_pkg.cmake

@@ -36,12 +36,12 @@ endif()
 
 if(CDAT_BUILD_ESMF_ESMP)
  if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL GNU)
- # GNU gfortran must be >= 4.3
- if(${Fortran_MAJOR_VERSION} GREATER 3 AND ${Fortran_MINOR_VERSION} GREATER 2)
+ # GNU gfortran must be >= 4.3 last 4.2 gfortran release was 4.2.4
+ if(${Fortran_VERSION} VERSION_GREATER "4.2.9" AND ${Fortran_VERSION} VERSION_LESS "5.2.2")
  ## On APPLE need to test for -arch as well!
  add_cdat_package(ESMF "" "Build ESMF" ON)
  else()
- message(FATAL_ERROR "[ERROR] gfortran must be 4.3 <= version < 5.0; you have ${Fortran_VERSION}")
+ message(FATAL_ERROR "[ERROR] gfortran must be 4.3 <= version < 5.2.2; you have ${Fortran_VERSION}")
  endif()
  else()
  add_cdat_package(ESMF "" "Build ESMF" ON)

CMake/cdat_modules/ffmpeg_external.cmake

@@ -6,9 +6,9 @@ set(ENV{PATH} $ENV{PATH}:${cdat_EXTERNALS}/bin)
 find_program(YASM_BIN "yasm")
 
 if (NOT YASM_BIN)
- set(ffmpeg_conf_args --disable-yasm^^--enable-gpl^^--enable-libx264^^--extra-cxxflags=@ffmpeg_source@^^--enable-shared^^--enable-zlib)
+ set(ffmpeg_conf_args --disable-yasm^^--enable-gpl^^--enable-libx264^^--extra-cxxflags=${ffmpeg_source}^^--enable-shared^^--enable-zlib)
 else()
- set(ffmpeg_conf_args --enable-gpl^^--enable-libx264^^--extra-cxxflags=@ffmpeg_source@^^--enable-shared^^--enable-zlib)
+ set(ffmpeg_conf_args --enable-gpl^^--enable-libx264^^--extra-cxxflags=${ffmpeg_source}^^--enable-shared^^--enable-zlib)
 endif()
 
 ExternalProject_Add(FFMPEG

CMake/cdat_modules/h5py_pkg.cmake

@@ -1,10 +1,10 @@
-set( H5PY_MAJOR 2 )
-set( H5PY_MINOR 4 )
-set( H5PY_PATCH 0 )
-set( H5PY_VERSION ${H5PY_MAJOR}.${H5PY_MINOR}.${H5PY_PATCH} )
-set( H5PY_URL ${LLNL_URL} )
-set( H5PY_GZ h5py-${H5PY_VERSION}.tar.gz )
-set( H5PY_MD5 80c9a94ae31f84885cc2ebe1323d6758)
+set(H5PY_MAJOR 2)
+set(H5PY_MINOR 5)
+set(H5PY_PATCH 0)
+set(H5PY_VERSION ${H5PY_MAJOR}.${H5PY_MINOR}.${H5PY_PATCH})
+set(H5PY_URL ${LLNL_URL})
+set(H5PY_GZ h5py-${H5PY_VERSION}.tar.gz)
+set(H5PY_MD5 969c78e366e8e86dcd0376d945a72dd0)
 
 set (nm H5PY)
 string(TOUPPER ${nm} uc_nm)

CMake/cdat_modules/libcdms_pkg.cmake

@@ -3,7 +3,7 @@ set(LIBCDMS_URL ${LLNL_URL})
 set(LIBCDMS_GZ libcdms-${LIBCDMS_VERSION}.tar.gz)
 set(LIBCDMS_SOURCE ${LIBCDMS_URL}/${LIBCDMS_GZ})
 set(LIBCDMS_MD5 ce71f54616f755d67fbbb6c81ca4fd62)
-set(LIBCDMS_BRANCH master)
+set(LIBCDMS_BRANCH uvcdat-2.4.0)
 set(LIBCDMS_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libcdms.git )
 
 set(GIT_CMD_STR_LIBCDMS GIT_REPOSITORY ${LIBCDMS_REPOSITORY})

CMake/cdat_modules/matplotlib_deps.cmake

@@ -1 +1 @@
-set(Matplotlib_deps ${pyqt_pkg} ${freetype_pkg} ${cairo_pkg} ${numpy_pkg} ${png_pkg} ${six_pkg} ${dateutils_pkg} ${pyparsing_pkg})
+set(Matplotlib_deps ${pyqt_pkg} ${freetype_pkg} ${cairo_pkg} ${numpy_pkg} ${png_pkg} ${six_pkg} ${dateutils_pkg} ${pyparsing_pkg} ${cycler_pkg})

CMake/cdat_modules/matplotlib_pkg.cmake

@@ -2,12 +2,12 @@ set(MATPLOTLIB_MAJOR_MIN 1)
 set(MATPLOTLIB_MINOR_MIN 1)
 set(MATPLOTLIB_PATCH_MIN 0)
 set(MATPLOTLIB_MAJOR 1)
-set(MATPLOTLIB_MINOR 4)
-set(MATPLOTLIB_PATCH 3)
+set(MATPLOTLIB_MINOR 5)
+set(MATPLOTLIB_PATCH 0)
 set(MATPLOTLIB_VERSION ${MATPLOTLIB_MAJOR}.${MATPLOTLIB_MINOR}.${MATPLOTLIB_PATCH})
 set(MATPLOTLIB_URL ${LLNL_URL})
 set(MATPLOTLIB_GZ matplotlib-${MATPLOTLIB_VERSION}.tar.gz)
-set(MATPLOTLIB_MD5 f1bb5e2317cceed593119fad2071e236)
+set(MATPLOTLIB_MD5 35a9cad23887dc6a7bd30cf434aa3f65)
 
 set(nm MATPLOTLIB)
 string(TOUPPER ${nm} uc_nm)

CMake/cdat_modules/openssl_deps.cmake

@@ -0,0 +1 @@
+set(OPENSSL_deps )

CMake/cdat_modules/openssl_external.cmake

@@ -0,0 +1,37 @@
+set (OPENSSL_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/build/openssl")
+set (OPENSSL_INSTALL_DIR "${cdat_EXTERNALS}")
+
+execute_process (COMMAND uname -s COMMAND tr -d '\n'
+ OUTPUT_VARIABLE HOST)
+STRING (TOLOWER ${HOST} HOST)
+execute_process (COMMAND uname -m COMMAND tr -d '\n'
+ OUTPUT_VARIABLE ARCHITECTURE)
+
+get_filename_component (COMPILER "${CMAKE_C_COMPILER}" NAME_WE)
+
+if (APPLE)
+ if (ARCHITECTURE MATCHES "64$")
+ set (HOST "${HOST}64")
+ endif ()
+ set (COMPILER "cc")
+endif ()
+
+set (OPENSSL_CONF_ARGS "${HOST}-${ARCHITECTURE}-${COMPILER}")
+set (OPENSSL_CONF_ARGS
+ ${OPENSSL_CONF_ARGS}
+ "--prefix=${OPENSSL_INSTALL_DIR}")
+
+ExternalProject_Add (openssl
+ DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
+ SOURCE_DIR ${OPENSSL_SOURCE_DIR}
+ INSTALL_DIR ${OPENSSL_INSTALL_DIR}
+ URL ${OPENSSL_SOURCE_URL}
+ URL_MD5 ${OPENSSL_MD5}
+ BUILD_IN_SOURCE 1
+ CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/Configure ${OPENSSL_CONF_ARGS}
+ DEPENDS ${OPENSSL_DEPS}
+ ${ep_log_options}
+ )
+
+set (OPENSSL_INCLUDE_DIR "${OPENSSL_INSTALL_DIR}/include")
+set (OPENSSL_LIBRARY_DIR "${OPENSSL_INSTALL_DIR}/lib")

CMake/cdat_modules/openssl_pkg.cmake

@@ -0,0 +1,37 @@
+option(CDAT_USE_SYSTEM_OPENSSL "Use system OpenSSL, if found." ON)
+mark_as_advanced(CDAT_USE_SYSTEM_OPENSSL)
+if(CDAT_USE_SYSTEM_OPENSSL)
+ find_package(OpenSSL QUIET)
+ if(OPENSSL_FOUND)
+ set(FILENAME_PATH_ARG "DIRECTORY")
+ if(CMAKE_VERSION VERSION_LESS 2.8.12)
+ # Support older version of GET_FILENAME_COMPONENT macro
+ # with legacy PATH argument
+ set(FILENAME_PATH_ARG "PATH")
+ endif(CMAKE_VERSION VERSION_LESS 2.8.12)
+ get_filename_component(OPENSSL_LIBRARY_DIR
+ "${OPENSSL_SSL_LIBRARY}" ${FILENAME_PATH_ARG})
+ message(STATUS "System OpenSSL found. "
+ "OpenSSL library directory: ${OPENSSL_LIBRARY_DIR}. "
+ "OpenSSL Version: ${OPENSSL_VERSION}")
+ endif(OPENSSL_FOUND)
+endif(CDAT_USE_SYSTEM_OPENSSL)
+
+if(NOT CDAT_USE_SYSTEM_OPENSSL OR NOT OPENSSL_FOUND)
+ set(OPENSSL_MAJOR_SRC 1)
+ set(OPENSSL_MINOR_SRC 0)
+ set(OPENSSL_PATCH_SRC 2e)
+ set(OPENSSL_VERSION
+ ${OPENSSL_MAJOR_SRC}.${OPENSSL_MINOR_SRC}.${OPENSSL_PATCH_SRC})
+
+ message(STATUS "Compiling OpenSSL from source. Version: ${OPENSSL_VERSION}")
+
+ set(OPENSSL_URL ${LLNL_URL})
+ set(OPENSSL_GZ "openssl-${OPENSSL_VERSION}.tar.gz")
+ set(OPENSSL_MD5 5262bfa25b60ed9de9f28d5d52d77fc5)
+ set(OPENSSL_SOURCE_URL ${OPENSSL_URL}/${OPENSSL_GZ})
+
+ # We've reached here because we need OpenSSL.
+ # Hence, defaulting to ON
+ add_cdat_package(openssl "" "" ON)
+endif(NOT CDAT_USE_SYSTEM_OPENSSL OR NOT OPENSSL_FOUND)

CMake/cdat_modules/r_pkg.cmake

@@ -1,9 +1,9 @@
 set(R_MAJOR_SRC 3)
 set(R_MINOR_SRC 2)
-set(R_PATCH_SRC 1)
+set(R_PATCH_SRC 2)
 set(R_URL ${LLNL_URL})
 set(R_GZ R-${R_MAJOR_SRC}.${R_MINOR_SRC}.${R_PATCH_SRC}.tar.gz)
-set(R_MD5 c2aac8b40f84e08e7f8c9068de9239a3)
+set(R_MD5 57cef5c2e210a5454da1979562a10e5b)
 set(R_SOURCE ${R_URL}/${R_GZ})
 
 set (nm R)

CMake/cdat_modules/readline_external.cmake

@@ -2,7 +2,7 @@ set(readline_source "${CMAKE_CURRENT_BINARY_DIR}/build/readline")
 set(readline_install "${cdat_EXTERNALS}")
 set(readline_conf_args)
 
-set(readline_conf_args "--with-curses --disable-static --enable-shared")
+set(readline_conf_args "--with-curses;--disable-static;--enable-shared")
 # with -fPIC
 IF(UNIX AND NOT WIN32)
  FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )

CMake/cdat_modules/seawater_pkg.cmake

@@ -1,10 +1,10 @@
-set( SEAWATER_MAJOR 3 )
-set( SEAWATER_MINOR 3 )
-set( SEAWATER_PATCH 2 )
-set( SEAWATER_VERSION ${SEAWATER_MAJOR}.${SEAWATER_MINOR}.${SEAWATER_PATCH} )
-set( SEAWATER_URL ${LLNL_URL} )
-set( SEAWATER_GZ python-seawater-${SEAWATER_VERSION}.tar.gz )
-set( SEAWATER_MD5 b23df1bbf3b96771aa9926dc851c4675 )
+set(SEAWATER_MAJOR 3)
+set(SEAWATER_MINOR 3)
+set(SEAWATER_PATCH 4)
+set(SEAWATER_VERSION ${SEAWATER_MAJOR}.${SEAWATER_MINOR}.${SEAWATER_PATCH})
+set(SEAWATER_URL ${LLNL_URL})
+set(SEAWATER_GZ python-seawater-${SEAWATER_VERSION}.tar.gz)
+set(SEAWATER_MD5 0932193350f42c055e7f523578ec1b7c)
 
 set (nm SEAWATER)
 string(TOUPPER ${nm} uc_nm)

CMake/cdat_modules/spyder_pkg.cmake

@@ -1,9 +1,9 @@
-set(SPYDER_MAJOR_SRC 3)
-set(SPYDER_MINOR_SRC 0)
-set(SPYDER_PATCH_SRC 0b1)
+set(SPYDER_MAJOR_SRC 2)
+set(SPYDER_MINOR_SRC 3)
+set(SPYDER_PATCH_SRC 8)
 set(SPYDER_URL ${LLNL_URL})
 set(SPYDER_ZIP spyder-${SPYDER_MAJOR_SRC}.${SPYDER_MINOR_SRC}.${SPYDER_PATCH_SRC}.zip)
 set(SPYDER_SOURCE ${SPYDER_URL}/${SPYDER_ZIP})
-set(SPYDER_MD5 0bd7a60573a839f9c85dd7a3eef61b4e)
+set(SPYDER_MD5 fb890dc956f606c43d560558159f3491)
 
-add_cdat_package_dependent(spyder "" "" OFF "CDAT_BUILD_GUI" OFF) 
+add_cdat_package_dependent(spyder "" "" OFF "CDAT_BUILD_GUI" OFF)

CMake/cdat_modules/uvcmetrics_pkg.cmake

@@ -6,7 +6,7 @@ set(UVCMETRICS_ZIP uvcmetrics-${UVCMETRICS_VERSION}.zip)
 #set(UVCMETRICS_SOURCE ${UVCMETRICS_URL}/${UVCMETRICS_ZIP})
 set(UVCMETRICS_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/uvcmetrics.git )
 set(UVCMETRICS_MD5)
-set(UVCMETRICS_BRANCH devel)
+set(UVCMETRICS_BRANCH uvcdat-2.4.0)
 
 if (NOT CDAT_BUILD_LEAN)
  add_cdat_package(UVCMETRICS "" "" ON)

CMake/cdat_modules/vacumm_pkg.cmake

@@ -1,10 +1,10 @@
-set( VACUMM_MAJOR 2 )
-set( VACUMM_MINOR 5 )
-set( VACUMM_PATCH 1-svn1807 )
-set( VACUMM_VERSION ${VACUMM_MAJOR}.${VACUMM_MINOR}.${VACUMM_PATCH} )
-set( VACUMM_URL ${LLNL_URL} )
-set( VACUMM_GZ vacumm-${VACUMM_VERSION}.tar.gz )
-set( VACUMM_MD5 9da3f6c29a86e29c0e6e3799fd9ef378 )
+set(VACUMM_MAJOR 3)
+set(VACUMM_MINOR 0)
+set(VACUMM_PATCH 0)
+set(VACUMM_VERSION ${VACUMM_MAJOR}.${VACUMM_MINOR}.${VACUMM_PATCH})
+set(VACUMM_URL ${LLNL_URL} )
+set(VACUMM_GZ vacumm-${VACUMM_VERSION}.tar.gz)
+set(VACUMM_MD5 b468fa72ddba9d0cd39d51164bef1dd4)
 
 set (nm VACUMM)
 string(TOUPPER ${nm} uc_nm)

CMake/cdat_modules/vistrails_pkg.cmake

@@ -1,6 +1,6 @@
 set(VISTRAILS_VERSION ${VISTRAILS_TAG_POINT})
 set(VISTRAILS_SOURCE "${GIT_PROTOCOL}github.com/UV-CDAT/VisTrails.git")
-set(VISTRAILS_VERSION uvcdat-2.1.0)
+set(VISTRAILS_VERSION uvcdat-2.4.0)
 set(VISTRAILS_MD5)
-set(VISTRAILS_BRANCH uvcdat-master)
+set(VISTRAILS_BRANCH uvcdat-2.4.0)
 add_cdat_package_dependent(vistrails "" "" ON "CDAT_BUILD_GUI" OFF)

CMake/cdat_modules/vtk_pkg.cmake

@@ -1,4 +1,4 @@
 set(VTK_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/VTK.git )
 set(VTK_MD5)
-set(VTK_BRANCH uvcdat-master)
+set(VTK_BRANCH uvcdat-2.4.0)
 add_cdat_package_dependent(VTK "" "" ON "CDAT_BUILD_GRAPHICS" OFF)

CMake/cdat_modules_extra/curses_patch_step.cmake.in

@@ -0,0 +1,5 @@
+execute_process(
+ WORKING_DIRECTORY @curses_source@
+ COMMAND patch -Np1
+ INPUT_FILE @cdat_CMAKE_SOURCE_DIR@/curses_gcc5.patch
+)

CMake/cdat_modules_extra/python_configure_step.cmake.in

@@ -1,3 +1,4 @@
+CMAKE_POLICY(SET CMP0012 NEW)
 
 set(ENV${CC} "@CMAKE_C_COMPILER@")
 set(ENV${CXX} "@CMAKE_CXX_COMPILER@")
@@ -26,13 +27,13 @@ if(APPLE)
  set(ENV{AQUA_CDAT} "no")
  set(ENV{MAC_OSX_DEPLOYMENT_TARGET} "@CMAKE_OSX_DEPLOYMENT_TARGET@")
  unset(ENV{MAKEFLAGS})
-endif()
-
-if(APPLE)
- set(library_param --prefix=@CMAKE_INSTALL_PREFIX@ --enable-framework=@CMAKE_INSTALL_PREFIX@/Library/Frameworks)
+ if(@_CURRENT_OSX_SDK_VERSION@ VERSION_LESS "10.11")
+ set(library_param --prefix=@CMAKE_INSTALL_PREFIX@ --with-system-expat --enable-framework=@CMAKE_INSTALL_PREFIX@/Library/Frameworks)
+ else()
+ set(library_param --prefix=@CMAKE_INSTALL_PREFIX@ --enable-framework=@CMAKE_INSTALL_PREFIX@/Library/Frameworks)
+ endif()
 elseif(UNIX)
  set(library_param --prefix=@CMAKE_INSTALL_PREFIX@ --enable-shared --enable-unicode=ucs4)
-
 endif()
 
 EXECUTE_PROCESS(

CMake/cdat_modules_extra/uvcdat.in

@@ -50,6 +50,13 @@ if [ $redirect = false ] ;then
 else
  # Replace all uses of ~ with $HOME
  target="${target/#\~/$HOME}"
+
+ # Check if path exists
+ target_dir="$(dirname $target)"
+ if [ ! -d "$target_dir" ] ;then
+ mkdir -p $target_dir
+ fi
+
  # Make sure the file exists and that we have write privileges
  touch $target
  # Launch with redirection