Skip to content

Commit 1219144

Browse files
aashish24aashish24
committed
Merge pull request #1110 from UV-CDAT/Yosemite
Now we can build on Yosemite
2 parents 77a3cc8 + 24cc3b6 commit 1219144

File tree

209 files changed

+219
-103707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+219
-103707
lines changed

‎CMake/cdat_modules/cdat_deps.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(CDAT_deps ${wget_pkg} ${python_pkg} ${numpy_pkg}
2-
${jasper_pkg} ${g2clib_pkg} ${tiff_pkg}
2+
${libcdms_pkg}
33
${libcf_pkg} ${netcdf_pkg} ${myproxyclient_pkg} ${udunits2_pkg})
44
if (CDAT_BUILD_GRAPHICS)
55
if (CDAT_BUILD_PARALLEL)

‎CMake/cdat_modules/cdat_external.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ExternalProject_Add(CDAT
4040
BUILD_COMMAND ""
4141
INSTALL_COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" ${CMAKE_COMMAND} -DPYTHON_INSTALL_ARGS=${cdat_xtra_flags} -P ${cdat_CMAKE_BINARY_DIR}/cdat_python_install_step.cmake
4242
DEPENDS ${CDAT_deps}
43+
${ep_log_options}
4344
)
4445

4546
#configure_file(${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_installed_pingdb_step.cmake.in

‎CMake/cdat_modules/hdf5_deps.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(HDf5_deps ${pkgconfig_pkg} ${libxml2_pkg} ${libxslt_pkg} ${zlib_pkg})
1+
set(HDF5_deps ${pkgconfig_pkg} ${libxml2_pkg} ${libxslt_pkg} ${zlib_pkg})

‎CMake/cdat_modules/libcdms_deps.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
set(libcdms_deps ${netcdf_pkg}
2+
${jasper_pkg} ${g2clib_pkg} ${tiff_pkg}
3+
${png_pkg} ${jpeg_pkg} )

‎CMake/cdat_modules/libcdms_external.cmake‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
set(libcdms_source "${CMAKE_CURRENT_BINARY_DIR}/build/libcdms")
2+
set(libcdms_install "${cdat_EXTERNALS}")
3+
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)
4+
file(MAKE_DIRECTORY ${cdat_EXTERNALS}/man/man3)
5+
6+
if(DEFINED GIT_CMD_STR_LIBCDMS )
7+
message("[INFO] [libcdms] Installing ${nm} from ${GIT_CMD_STR_LIBCDMS}")
8+
include(GetGitRevisionDescription)
9+
set(URL_STR )
10+
set(URL_MD5_STR )
11+
else()
12+
message("[INFO] [libcdms] Installed ${nm} from tarball ${LIBCDMS_GZ}")
13+
set(URL_STR URL ${LIBCDMS_URL}/${LIBCDMS_GZ})
14+
set(URL_MD5_STR URL_MD5 ${LIBCDMS_MD5})
15+
set(GIT_CMD_STR_LIBCDMS )
16+
set(GIT_TAG )
17+
endif()
18+
set(LIBCDMS_MAKE_ARGS -j1)
19+
set(LIBCDMS_BUILD_ARGS -fPIC)
20+
ExternalProject_Add(libcdms
21+
LIST_SEPARATOR ^^
22+
DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
23+
SOURCE_DIR ${libcdms_source}
24+
INSTALL_DIR ${libcdms_install}
25+
${URL_STR}
26+
${URL_MD5_STR}
27+
${GIT_CMD_STR_LIBCDMS}
28+
${GIT_TAG}
29+
PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
30+
BUILD_IN_SOURCE 1
31+
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
32+
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
33+
DEPENDS ${libcdms_deps}
34+
${ep_log_options}
35+
)
36+
if (DEFINED GIT_CMD_STR_LIBCDMS)
37+
unset(GIT_CMD_STR_LIBCDMS)
38+
endif()

‎CMake/cdat_modules/libcdms_pkg.cmake‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
set(LIBCDMS_VERSION 1.0.0)
2+
set(LIBCDMS_URL ${LLNL_URL})
3+
set(LIBCDMS_GZ libcdms-${LIBCDMS_VERSION}.tar.gz)
4+
set(LIBCDMS_SOURCE ${LIBCDMS_URL}/${LIBCDMS_GZ})
5+
set(LIBCDMS_MD5 ce71f54616f755d67fbbb6c81ca4fd62)
6+
set(LIBCDMS_BRANCH master)
7+
set(LIBCDMS_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libcdms.git )
8+
9+
set(GIT_CMD_STR_LIBCDMS GIT_REPOSITORY ${LIBCDMS_REPOSITORY})
10+
set(GIT_TAG GIT_TAG "${LIBCDMS_BRANCH}")
11+
12+
add_cdat_package(libcdms "" "" OFF)

‎CMake/cdat_modules/netcdf_deps.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(NetCDF_deps ${pkgconfig_pkg} ${hdf5_pkg} ${curl_pkg} ${zlib_pkg})
1+
set(NetCDF_deps ${pkgconfig_pkg} ${hdf5_pkg} ${curl_pkg} ${zlib_pkg} ${jpeg_pkg} )

‎CMake/cdat_modules/paraview_external.cmake‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,17 @@ if (CDAT_BUILD_PARALLEL)
5555
endif()
5656
endif()
5757

58+
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")
59+
60+
if(NOT CDAT_BUILD_LEAN)
61+
list(APPEND _vtk_modules "vtkIOFFMPEG")
62+
endif()
5863
# Either we use cdat zlib and libxml or system zlib and libxml
5964
list(APPEND ParaView_tpl_args
6065
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON
6166
-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON
6267
-DVTK_USE_SYSTEM_HDF5:BOOL=ON
63-
-DVTK_USE_SYSTEM_NETCDF:BOOL=ON
68+
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
6469
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON
6570
)
6671

@@ -74,21 +79,21 @@ list(APPEND ParaView_tpl_args
7479
)
7580

7681
# Use cdat zlib
77-
if(NOT CDAT_USE_SYSTEM_ZLIB)
78-
list(APPEND ParaView_tpl_args
79-
-DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
80-
-DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
81-
)
82-
endif()
82+
#if(NOT CDAT_USE_SYSTEM_ZLIB)
83+
# list(APPEND ParaView_tpl_args
84+
# -DZLIB_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include
85+
# -DZLIB_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
86+
# )
87+
#endif()
8388

8489
# Use cdat libxml
85-
if(NOT CDAT_USE_SYSTEM_LIBXML2)
86-
list(APPEND ParaView_tpl_args
87-
-DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
88-
-DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
89-
-DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
90-
)
91-
endif()
90+
#if(NOT CDAT_USE_SYSTEM_LIBXML2)
91+
# list(APPEND ParaView_tpl_args
92+
# -DLIBXML2_INCLUDE_DIR:PATH=${cdat_EXTERNALS}/include/libxml2
93+
# -DLIBXML2_LIBRARIES:FILEPATH=${cdat_EXTERNALS}/lib/libxml2${_LINK_LIBRARY_SUFFIX}
94+
# -DLIBXML2_XMLLINT_EXECUTABLE:FILEPATH=${cdat_EXTERNALS}/bin/xmllint
95+
# )
96+
#endif()
9297

9398
# Use cdat hdf5
9499
if(NOT CDAT_USE_SYSTEM_HDF5)
@@ -101,12 +106,12 @@ if(NOT CDAT_USE_SYSTEM_HDF5)
101106
-DHDF5_hdf5_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libhdf5${_LINK_LIBRARY_SUFFIX}
102107
)
103108

104-
if(NOT CDAT_USE_SYSTEM_ZLIB)
105-
list(APPEND ParaView_tpl_args
106-
-DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
107-
-DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
108-
)
109-
endif()
109+
# if(NOT CDAT_USE_SYSTEM_ZLIB)
110+
# list(APPEND ParaView_tpl_args
111+
# -DHDF5_z_LIBRARY:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
112+
# -DHDF5_z_LIBRARY_RELEASE:FILEPATH=${cdat_EXTERNALS}/lib/libz${_LINK_LIBRARY_SUFFIX}
113+
# )
114+
# endif()
110115
endif()
111116

112117
# Check if should build GUI
@@ -178,6 +183,10 @@ else ()
178183
set(DOWNLOAD_CMD_STR)
179184
endif()
180185

186+
set(_vtk_module_options)
187+
foreach(_module ${_vtk_modules})
188+
list(APPEND _vtk_module_options "-DModule_${_module}:BOOL=ON")
189+
endforeach()
181190
ExternalProject_Add(ParaView
182191
DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
183192
SOURCE_DIR ${ParaView_source}
@@ -207,6 +216,7 @@ ExternalProject_Add(ParaView
207216
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
208217
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
209218
-DVTK_LEGACY_SILENT:BOOL=ON
219+
${_vtk_module_options}
210220
-DPARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON
211221
CMAKE_ARGS
212222
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>

‎CMake/cdat_modules/sampledata_deps.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(sampledata_deps ${cdat_pkg})

‎CMake/cdat_modules/sampledata_external.cmake‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
if (CDAT_DOWNLOAD_SAMPLE_DATA)
2+
message("[INFO] ------------------------------------------------------------------------------------------------------------------------------")
3+
configure_file(
4+
"${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/cdat_download_sample_data.cmake.in"
5+
"${cdat_CMAKE_BINARY_DIR}/cdat_download_sample_data.cmake"
6+
@ONLY
7+
)
8+
set(sampledata_cmd ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/cdat_download_sample_data.cmake)
9+
ExternalProject_Add(sampledata
10+
SOURCE_DIR ${cdat_SOURCE_DIR}/Packages/dat
11+
CONFIGURE_COMMAND ${sampledata_cmd}
12+
BUILD_COMMAND ""
13+
INSTALL_COMMAND ""
14+
DEPENDS ${sampledata_deps}
15+
${ep_log_options}
16+
)
17+
endif()

0 commit comments

Comments
 (0)
⚡