CDAT · aashish24 · Mar 5, 2015 · Feb 13, 2015 · Feb 24, 2015 · Feb 25, 2015
diff --git a/CMake/cdat_modules/cdat_deps.cmake b/CMake/cdat_modules/cdat_deps.cmake
@@ -1,5 +1,5 @@
 set(CDAT_deps ${wget_pkg} ${python_pkg} ${numpy_pkg}
- ${jasper_pkg} ${g2clib_pkg} ${tiff_pkg}
+ ${libcdms_pkg}
  ${libcf_pkg} ${netcdf_pkg} ${myproxyclient_pkg} ${udunits2_pkg})
 if (CDAT_BUILD_GRAPHICS)
  if (CDAT_BUILD_PARALLEL)

diff --git a/CMake/cdat_modules/cdat_external.cmake b/CMake/cdat_modules/cdat_external.cmake
@@ -40,6 +40,7 @@ ExternalProject_Add(CDAT
  BUILD_COMMAND ""
  INSTALL_COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" ${CMAKE_COMMAND} -DPYTHON_INSTALL_ARGS=${cdat_xtra_flags} -P ${cdat_CMAKE_BINARY_DIR}/cdat_python_install_step.cmake
  DEPENDS ${CDAT_deps}
+ ${ep_log_options}
 )
 
 #configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_installed_pingdb_step.cmake.in

diff --git a/CMake/cdat_modules/hdf5_deps.cmake b/CMake/cdat_modules/hdf5_deps.cmake
@@ -1 +1 @@
-set(HDf5_deps ${pkgconfig_pkg} ${libxml2_pkg} ${libxslt_pkg} ${zlib_pkg})
+set(HDF5_deps ${pkgconfig_pkg} ${libxml2_pkg} ${libxslt_pkg} ${zlib_pkg})
diff --git a/CMake/cdat_modules/libcdms_deps.cmake b/CMake/cdat_modules/libcdms_deps.cmake
@@ -0,0 +1,3 @@
+set(libcdms_deps ${netcdf_pkg} 
+ ${jasper_pkg} ${g2clib_pkg} ${tiff_pkg}
+ ${png_pkg} ${jpeg_pkg} )
diff --git a/CMake/cdat_modules/libcdms_external.cmake b/CMake/cdat_modules/libcdms_external.cmake
@@ -0,0 +1,38 @@
+set(libcdms_source "${CMAKE_CURRENT_BINARY_DIR}/build/libcdms")
+set(libcdms_install "${cdat_EXTERNALS}")
+set(CONFIGURE_ARGS --srcdir=${libcdms_source}^^--enable-dap=^^--enable-drs=no^^--enable-hdf=no^^--enable-pp=yes^^--enable-ql=no^^--cache-file=/dev/null^^--prefix=${libcdms_install}^^--with-nclib=${cdat_EXTERNALS}/lib^^--with-ncinc=${cdat_EXTERNALS}/include^^--with-daplib=/lib^^--with-dapinc=/include^^--with-hdfinc=./include^^--with-hdflib=./lib^^--with-hdf5lib=${cdat_EXTERNALS}/lib^^--with-grib2lib=${cdat_EXTERNALS}/lib^^--with-jasperlib=${cdat_EXTERNALS}/lib^^--with-grib2inc=${cdat_EXTERNALS}/include^^--enable-grib2)
+file(MAKE_DIRECTORY ${cdat_EXTERNALS}/man/man3)
+
+if(DEFINED GIT_CMD_STR_LIBCDMS )
+ message("[INFO] [libcdms] Installing ${nm} from ${GIT_CMD_STR_LIBCDMS}")
+ include(GetGitRevisionDescription)
+ set(URL_STR )
+ set(URL_MD5_STR )
+else()
+ message("[INFO] [libcdms] Installed ${nm} from tarball ${LIBCDMS_GZ}")
+ set(URL_STR URL ${LIBCDMS_URL}/${LIBCDMS_GZ})
+ set(URL_MD5_STR URL_MD5 ${LIBCDMS_MD5})
+ set(GIT_CMD_STR_LIBCDMS )
+ set(GIT_TAG )
+endif()
+set(LIBCDMS_MAKE_ARGS -j1)
+set(LIBCDMS_BUILD_ARGS -fPIC)
+ExternalProject_Add(libcdms
+ LIST_SEPARATOR ^^
+ DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
+ SOURCE_DIR ${libcdms_source}
+ INSTALL_DIR ${libcdms_install}
+ ${URL_STR}
+ ${URL_MD5_STR}
+ ${GIT_CMD_STR_LIBCDMS}
+ ${GIT_TAG}
+ PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
+ BUILD_IN_SOURCE 1
+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBCDMS_BUILD_ARGS} -DCONFIGURE_ARGS=${CONFIGURE_ARGS} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
+ BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBCDMS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBCDMS_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+ DEPENDS ${libcdms_deps}
+ ${ep_log_options}
+)
+if (DEFINED GIT_CMD_STR_LIBCDMS)
+ unset(GIT_CMD_STR_LIBCDMS)
+endif()
diff --git a/CMake/cdat_modules/libcdms_pkg.cmake b/CMake/cdat_modules/libcdms_pkg.cmake
@@ -0,0 +1,12 @@
+set(LIBCDMS_VERSION 1.0.0)
+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_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libcdms.git )
+
+set(GIT_CMD_STR_LIBCDMS GIT_REPOSITORY ${LIBCDMS_REPOSITORY})
+set(GIT_TAG GIT_TAG "${LIBCDMS_BRANCH}")
+
+add_cdat_package(libcdms "" "" OFF)
diff --git a/CMake/cdat_modules/netcdf_deps.cmake b/CMake/cdat_modules/netcdf_deps.cmake
@@ -1 +1 @@
-set(NetCDF_deps ${pkgconfig_pkg} ${hdf5_pkg} ${curl_pkg} ${zlib_pkg})
+set(NetCDF_deps ${pkgconfig_pkg} ${hdf5_pkg} ${curl_pkg} ${zlib_pkg} ${jpeg_pkg} )
diff --git a/CMake/cdat_modules/paraview_external.cmake b/CMake/cdat_modules/paraview_external.cmake
@@ -55,12 +55,17 @@ if (CDAT_BUILD_PARALLEL)
  endif()
 endif()
 
+set(_vtk_modules "vtkRenderingImage;vtkRenderingVolume;vtkRenderingLabel;vtkRenderingFreeType;vtkRenderingFreeTypeOpenGL;vtkRenderingVolumeOpenGL;vtkRenderingCore;vtkRenderingOpenGL;vtkGeovisCore;vtkViewsCore;vtkViewsGeovis;vtkInteractionImage;vtkInteractionStyle;vtkInteractionWidgets;vtkCommonTransforms;vtkCommonCore;vtkCommonComputationalGeometry;vtkCommonExecutionModel;vtkCommonSystem;vtkCommonMisc;vtkFiltersFlowPaths;vtkFiltersStatistics;vtkFiltersAMR;vtkFiltersGeneric;vtkFiltersSources;vtkFiltersModeling;vtkFiltersExtraction;vtkFiltersSelection;vtkFiltersSMP;vtkFiltersCore;vtkFiltersHybrid;vtkFiltersTexture;vtkFiltersGeneral;vtkFiltersImaging;vtkFiltersGeometry;vtkIOImage;vtkIOCore;vtkIOExport;vtkIOImport;vtkIOGeometry;vtkImagingColor;vtkImagingSources;vtkImagingCore;vtkImagingGeneral;vtkImagingMath")
+
+if(NOT CDAT_BUILD_LEAN)
+ list(APPEND _vtk_modules "vtkIOFFMPEG")
+endif()
 # Either we use cdat zlib and libxml or system zlib and libxml
 list(APPEND ParaView_tpl_args
  -DVTK_USE_SYSTEM_ZLIB:BOOL=ON
  -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON
  -DVTK_USE_SYSTEM_HDF5:BOOL=ON
- -DVTK_USE_SYSTEM_NETCDF:BOOL=ON
+ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
  -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
 )
 
@@ -74,21 +79,21 @@ list(APPEND ParaView_tpl_args
 )
 
 # Use cdat zlib
-if(NOT CDAT_USE_SYSTEM_ZLIB)
- list(APPEND ParaView_tpl_args
- -DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
- -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
- )
-endif()
+#if(NOT CDAT_USE_SYSTEM_ZLIB)
+# list(APPEND ParaView_tpl_args
+# -DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
+# -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
+# )
+#endif()
 
 # Use cdat libxml
-if(NOT CDAT_USE_SYSTEM_LIBXML2)
- list(APPEND ParaView_tpl_args
- -DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
- -DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
- -DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
- )
-endif()
+#if(NOT CDAT_USE_SYSTEM_LIBXML2)
+# list(APPEND ParaView_tpl_args
+# -DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
+# -DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
+# -DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
+# )
+#endif()
 
 # Use cdat hdf5
 if(NOT CDAT_USE_SYSTEM_HDF5)
@@ -101,12 +106,12 @@ if(NOT CDAT_USE_SYSTEM_HDF5)
  -DHDF5_hdf5_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
  )
 
- if(NOT CDAT_USE_SYSTEM_ZLIB)
- list(APPEND ParaView_tpl_args
- -DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
- -DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
- )
- endif()
+# if(NOT CDAT_USE_SYSTEM_ZLIB)
+# list(APPEND ParaView_tpl_args
+# -DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
+# -DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
+# )
+# endif()
 endif()
 
 # Check if should build GUI
@@ -178,6 +183,10 @@ else ()
  set(DOWNLOAD_CMD_STR)
 endif()
 
+set(_vtk_module_options)
+foreach(_module ${_vtk_modules})
+ list(APPEND _vtk_module_options "-DModule_${_module}:BOOL=ON")
+endforeach()
 ExternalProject_Add(ParaView
  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
  SOURCE_DIR ${ParaView_source}
@@ -207,6 +216,7 @@ ExternalProject_Add(ParaView
  -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
  -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
  -DVTK_LEGACY_SILENT:BOOL=ON
+ ${_vtk_module_options}
  -DPARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON
  CMAKE_ARGS
  -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>

diff --git a/CMake/cdat_modules/sampledata_deps.cmake b/CMake/cdat_modules/sampledata_deps.cmake
@@ -0,0 +1 @@
+set(sampledata_deps ${cdat_pkg})
diff --git a/CMake/cdat_modules/sampledata_external.cmake b/CMake/cdat_modules/sampledata_external.cmake
@@ -0,0 +1,17 @@
+if (CDAT_DOWNLOAD_SAMPLE_DATA)
+ message("[INFO] ------------------------------------------------------------------------------------------------------------------------------")
+ configure_file(
+ "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_download_sample_data.cmake.in"
+ "${cdat_CMAKE_BINARY_DIR}/cdat_download_sample_data.cmake"
+ @ONLY
+ )
+ set(sampledata_cmd ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/cdat_download_sample_data.cmake)
+ ExternalProject_Add(sampledata
+ SOURCE_DIR ${cdat_SOURCE_DIR}/Packages/dat
+ CONFIGURE_COMMAND ${sampledata_cmd}
+ BUILD_COMMAND ""
+ INSTALL_COMMAND ""
+ DEPENDS ${sampledata_deps}
+ ${ep_log_options}
+ )
+endif()
diff --git a/CMake/cdat_modules/sampledata_pkg.cmake b/CMake/cdat_modules/sampledata_pkg.cmake
@@ -0,0 +1,2 @@
+
+add_cdat_package(sampledata "" "" ON)
diff --git a/CMake/cdat_modules/scipy_pkg.cmake b/CMake/cdat_modules/scipy_pkg.cmake
@@ -2,11 +2,11 @@ set(SCIPY_MAJOR 0)
 set(SCIPY_MINOR 10)
 set(SCIPY_PATCH 0)
 set(SCIPY_MAJOR_SRC 0)
-set(SCIPY_MINOR_SRC 14)
-set(SCIPY_PATCH_SRC 0)
+set(SCIPY_MINOR_SRC 15)
+set(SCIPY_PATCH_SRC 1)
 set(SCIPY_URL ${LLNL_URL})
 set(SCIPY_GZ scipy-${SCIPY_MAJOR_SRC}.${SCIPY_MINOR_SRC}.${SCIPY_PATCH_SRC}.tar.gz)
-set(SCIPY_MD5 d7c7f4ccf8b07b08d6fe49d5cd51f85d)
+set(SCIPY_MD5 be56cd8e60591d6332aac792a5880110)
 set(SCIPY_SOURCE ${SCIPY_URL}/${SCIPY_GZ})
 
 set (nm SCIPY)

diff --git a/CMake/cdat_modules/uuid_deps.cmake b/CMake/cdat_modules/uuid_deps.cmake
@@ -1 +1 @@
-
+set(uuid_deps ${pkgconfig_pkg} )
diff --git a/CMake/cdat_modules/uuid_external.cmake b/CMake/cdat_modules/uuid_external.cmake
@@ -11,7 +11,7 @@ ExternalProject_Add(uuid
  BUILD_IN_SOURCE 1
  PATCH_COMMAND ""
  CONFIGURE_COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake
- DEPENDS ${uuid_DEPENDENCY}
+ DEPENDS ${uuid_deps}
  ${ep_log_options}
 )
 

diff --git a/CMake/cdat_modules/vtk_deps.cmake b/CMake/cdat_modules/vtk_deps.cmake
@@ -1,4 +1,4 @@
-set(VTK_deps ${pkgconfig_pkg} ${python_pkg} ${hdf5_pkg} ${png_pkg} ${jpeg_pkg} ${libxml2_pkg} ${freetype_pkg} ${netcdfplus_pkg} ${zlib_pkg})
+set(VTK_deps ${pkgconfig_pkg} ${python_pkg} ${tiff_pkg} ${hdf5_pkg} ${freetype_pkg} ${netcdfplus_pkg} ${netcdf_pkg})
 
 if (NOT CDAT_BUILD_GUI)
  list(APPEND VTK_deps ${qt_pkg})

diff --git a/CMake/cdat_modules/vtk_external.cmake b/CMake/cdat_modules/vtk_external.cmake
@@ -17,6 +17,8 @@ list(APPEND vtk_build_args
  -DVTK_USE_SYSTEM_HDF5:BOOL=ON
  -DVTK_USE_SYSTEM_NETCDF:BOOL=ON
  -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
+ -DVTK_USE_SYSTEM_JPEG:BOOL=ON
+ -DVTK_USE_SYSTEM_PNG:BOOL=ON
 )
 
 # Turn off testing and other non essential featues
@@ -26,21 +28,21 @@ list(APPEND vtk_build_args
 )
 
 # Use cdat zlib
-if(NOT CDAT_USE_SYSTEM_ZLIB)
- list(APPEND vtk_build_args
- -DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
- -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
- )
-endif()
+#if(NOT CDAT_USE_SYSTEM_ZLIB)
+# list(APPEND vtk_build_args
+# -DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
+#  -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
+# )
+#endif()
 
 # Use cdat libxml
-if(NOT CDAT_USE_SYSTEM_LIBXML2)
- list(APPEND vtk_build_args
- -DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
- -DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
- -DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
- )
-endif()
+#if(NOT CDAT_USE_SYSTEM_LIBXML2)
+# list(APPEND vtk_build_args
+# -DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
+# -DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
+# -DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
+# )
+#endif()
 
 # Use cdat hdf5
 if(NOT CDAT_USE_SYSTEM_HDF5)
@@ -53,12 +55,12 @@ if(NOT CDAT_USE_SYSTEM_HDF5)
  -DHDF5_hdf5_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
  )
 
- if(NOT CDAT_USE_SYSTEM_ZLIB)
- list(APPEND vtk_build_args
- -DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
- -DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
- )
- endif()
+# if(NOT CDAT_USE_SYSTEM_ZLIB)
+# list(APPEND vtk_build_args
+# -DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
+# -DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
+# )
+# endif()
 endif()
 
 if(CDAT_BUILD_OFFSCREEN)

diff --git a/CMake/cdat_modules_extra/cdat_cmake_make_step.cmake.in b/CMake/cdat_modules_extra/cdat_cmake_make_step.cmake.in
@@ -4,7 +4,9 @@ if(NOT APPLE)
 endif()
 
 execute_process(
- COMMAND make
+ COMMAND make "${BUILD_ARGS}"
+ OUTPUT_VARIABLE CDAT_OUT
+ ERROR_VARIABLE CDAT_ERR
  WORKING_DIRECTORY "${WORKING_DIR}"
  RESULT_VARIABLE res)
 

diff --git a/CMake/cdat_modules_extra/cdat_common_environment.cmake.in b/CMake/cdat_modules_extra/cdat_common_environment.cmake.in
@@ -1,5 +1,6 @@
+message("[INFO] ADDITIONAL CFLAGS ${ADDITIONAL_CFLAGS}")
 set(ENV{PATH} "@cdat_EXTERNALS@/bin:$ENV{PATH}")
-set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:@cdat_EXTERNALS@/lib/paraview-@PARAVIEW_MAJOR@.@PARAVIEW_MINOR@:$ENV{@LIBRARY_PATH@} @cdat_osx_ld_flags@")
+set(ENV{@LIBRARY_PATH@} "@CMAKE_INSTALL_PREFIX@/lib:@cdat_EXTERNALS@/lib:@cdat_EXTERNALS@/lib/paraview-@PARAVIEW_MAJOR@.@PARAVIEW_MINOR@:$ENV{@LIBRARY_PATH@}")
 if (NOT DEFINED SKIP_LDFLAGS)
  set(ENV{LDFLAGS} "-L@cdat_EXTERNALS@/lib @cdat_external_link_directories@ @cdat_rpath_flag@@CMAKE_INSTALL_PREFIX@/lib @cdat_rpath_flag@@cdat_EXTERNALS@/lib")
 endif()
@@ -16,6 +17,7 @@ set(ENV{FFLAGS} "")
 set(ENV{FLIBS} "")
 set(ENV{LD_X11} "") # for xgks
 set(ENV{PYTHONPATH} @PYTHONPATH@)
+set(ENV{CC} @CMAKE_C_COMPILER@)
 
 if(APPLE)
  set(ENV{MAC_OSX_DEPLOYMENT_TARGET} "@CMAKE_OSX_DEPLOYMENT_TARGET@")

diff --git a/CMake/cdat_modules_extra/cdat_configure_step.cmake.in b/CMake/cdat_modules_extra/cdat_configure_step.cmake.in
@@ -4,9 +4,11 @@ set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 message("CONFIGURE_ARGS IS ${CONFIGURE_ARGS}")
+message("LD_ARGS IS $ENV{@LIBRARY_PATH@}")
+message("CFLAGS : $ENV{CFLAGS}")
 
 execute_process(
-  COMMAND env LD_LIBRARY_PATH=$ENV{@LIBRARY_PATH@} DYLD_FALLBACK_LIBRARY_PATH=$ENV{@LIBRARY_PATH@} @LIBRARY_PATH@=$ENV{@LIBRARY_PATH@} PKG_CONFIG=$ENV{PKG_CONFIG} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} sh configure --prefix=${INSTALL_DIR} ${CONFIGURE_ARGS}
+ COMMAND env CC=$ENV{CC} CFLAGS=$ENV{CFLAGS} LD_LIBRARY_PATH=$ENV{@LIBRARY_PATH@} DYLD_FALLBACK_LIBRARY_PATH=$ENV{@LIBRARY_PATH@} @LIBRARY_PATH@=$ENV{@LIBRARY_PATH@} PKG_CONFIG=$ENV{PKG_CONFIG} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} sh configure --prefix=${INSTALL_DIR} ${CONFIGURE_ARGS}
  WORKING_DIRECTORY "${WORKING_DIR}"
  RESULT_VARIABLE res)
 

diff --git a/CMake/cdat_modules_extra/cdat_download_sample_data.cmake.in b/CMake/cdat_modules_extra/cdat_download_sample_data.cmake.in
@@ -0,0 +1,10 @@
+file(READ @cdat_SOURCE_DIR@/Packages/dat/files.txt SAMPLE_FILES)
+string(REPLACE "\n" ";" SAMPLE_LIST ${SAMPLE_FILES})
+foreach(SAMPLE_FILE ${SAMPLE_LIST})
+ STRING(REPLACE " " ";" DOWNLOAD_LIST ${SAMPLE_FILE})
+ LIST(GET DOWNLOAD_LIST 0 MD5)
+ LIST(GET DOWNLOAD_LIST 1 FILE_NM)
+ message("[INFO] Attempting to download http://uv-cdat.llnl.gov/cdat/sample_data/${FILE_NM} WITH MD5 ${MD5} to @PYTHON_SITE_PACKAGES_PREFIX@/sample_data/${FILE_NM}")
+ file(DOWNLOAD http://uv-cdat.llnl.gov/cdat/sample_data/${FILE_NM} @PYTHON_SITE_PACKAGES_PREFIX@/sample_data/${FILE_NM} EXPECTED_MD5=${MD5})
+endforeach()
+set(res 0)
diff --git a/CMake/cdat_modules_extra/cdat_make_step.cmake.in b/CMake/cdat_modules_extra/cdat_make_step.cmake.in
@@ -4,15 +4,15 @@ include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 if(NOT ${make})
  set(make make)
 endif()
-
 execute_process(
- COMMAND ${make} ${BUILD_ARGS}
+ COMMAND env CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} CPPFLAGS=$ENV{CPPFLAGS} CXXFLAGS=$ENV{CXXFLAG} ${make} ${BUILD_ARGS}
  WORKING_DIRECTORY "${WORKING_DIR}"
+ OUTPUT_VARIABLE CDAT_OUT
+ ERROR_VARIABLE CDAT_ERR
  RESULT_VARIABLE res)
 
 if(NOT ${res} EQUAL 0)
- message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
+ message("[ERROR] Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
  message(FATAL_ERROR "Error in Make")
 endif()
-message("Make succeeded.")