-
Notifications
You must be signed in to change notification settings - Fork 68
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Now we can build on Yosemite #1110
Changes from all commits
1df6374
76d1a74
871ee89
6cfb167
55b955f
6c563ec
951e6a2
fe49820
ebe2591
12eed98
65bae38
de6af3f
c9de3ce
dccfee6
e836065
a5efb38
c227288
772b916
3d25ee5
b4f4d7a
a9c10e6
5472584
bf507f7
d2e623b
a2f42cc
b24fa23
24cc3b6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
set(HDf5_deps ${pkgconfig_pkg} ${libxml2_pkg} ${libxslt_pkg} ${zlib_pkg}) | ||
set(HDF5_deps ${pkgconfig_pkg} ${libxml2_pkg} ${libxslt_pkg} ${zlib_pkg}) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
set(libcdms_deps ${netcdf_pkg} | ||
${jasper_pkg} ${g2clib_pkg} ${tiff_pkg} | ||
${png_pkg} ${jpeg_pkg} ) | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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} ) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
set(sampledata_deps ${cdat_pkg}) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
|
||
add_cdat_package(sampledata "" "" ON) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
|
||
set(uuid_deps ${pkgconfig_pkg} ) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Aashish will comment more, but is there a compelling reason to make these changes in master? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes I turned off zlib and libxml2 libxslt etc.. there are on every system. I guess we can uncomment if you want but I'm not positive about what happen to CDAT_USE_SYSTEM_ZLIB now that we don't have include(libz_pkg) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have to review bit more but basically if we use system PNG, JPEG etc, then we have to pass the appropriate flags to VTK or else VTK will build its on vtkjpeg, and vtkpng as well. So thing will build but won't run. Also, I don't know why we took out cdms? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ok i fixed that already. And libcdms was simply moved out to its own repo, easier to maintain |
||
# 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) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why depending on png? and jpeg?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jasper needs jpeg
g2clib needs png