Skip to content

Commit ecd7e55

Browse files
doutriaux1doutriaux1
committed
Merge pull request #1933 from UV-CDAT/master
merging master into release
2 parents a7445aa + 97fda7c commit ecd7e55

File tree

398 files changed

+4300
-32910
lines changed

Some content is hidden

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

398 files changed

+4300
-32910
lines changed

‎CMake/cdat_modules/cd77_deps.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(cd77_deps ${python_pkg} ${ezget_pkg} ${libcdms_pkg} ${setuptools_pkg} )

‎CMake/cdat_modules/cd77_external.cmake‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# create an external project to install cd77
2+
# and configure and build it
3+
4+
ExternalProject_Add(cd77
5+
DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
6+
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/build/cd77
7+
${GIT_CMD_STR_cd77}
8+
${GIT_TAG_cd77}
9+
BUILD_IN_SOURCE 1
10+
CONFIGURE_COMMAND ""
11+
BUILD_COMMAND ""
12+
INSTALL_COMMAND env LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} PYTHONPATH=${PYTHONPATH} ${USR_ENVS} ${PYTHON_EXECUTABLE} setup.py install ${USER_INSTALL_OPTIONS} ${PRFX}
13+
DEPENDS ${${nm}_deps}
14+
${ep_log_options}
15+
)
16+

‎CMake/cdat_modules/cd77_pkg.cmake‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
set(cd77_VERSION 1.0.0)
2+
set(cd77_BRANCH master)
3+
set(cd77_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/cd77.git )
4+
5+
6+
set(GIT_CMD_STR_cd77 GIT_REPOSITORY ${cd77_REPOSITORY})
7+
set(GIT_TAG_cd77 GIT_TAG "${cd77_BRANCH}")
8+
set (nm cd77)
9+
string(TOUPPER ${nm} uc_nm)
10+
11+
if (CDAT_BUILD_PCMDI)
12+
add_cdat_package(cd77 "" "" ON)
13+
endif()

‎CMake/cdat_modules/cdat_external.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set(CDAT_source "${cdat_SOURCE_DIR}")
33
set(RUNTIME_FLAGS ${cdat_EXTERNALS}/lib)
44
set(LDFLAGS -L${cdat_EXTERNALS}/lib)
55

6-
if (CDAT_BUILD_WITH_LIBDRS)
7-
set(cdat_xtra_flags "${cdat_xtra_flags} -c pcmdi.py")
6+
if (CDAT_BUILD_LIBDRS)
7+
set(cdat_xtra_flags "${cdat_xtra_flags} --enable-drs")
88
endif()
99

1010
set(cdat_build_dir ${CMAKE_CURRENT_BINARY_DIR}/cdat-build)

‎CMake/cdat_modules/cffi_pkg.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
set(CFFI_MAJOR_SRC 0)
2-
set(CFFI_MINOR_SRC 8)
1+
set(CFFI_MAJOR_SRC 1)
2+
set(CFFI_MINOR_SRC 5)
33
set(CFFI_PATCH_SRC 2)
44

55
set(CFFI_VERSION ${CFFI_MAJOR_SRC}.${CFFI_MINOR_SRC}.${CFFI_PATCH_SRC})
66
set(CFFI_GZ cffi-${CFFI_VERSION}.tar.gz)
77
set(CFFI_SOURCE ${LLNL_URL}/${CFFI_GZ})
8-
set(CFFI_MD5 37fc88c62f40d04e8a18192433f951ec)
8+
set(CFFI_MD5 fa766133f7299464c8bf857e0c966a82)
99

1010
add_cdat_package_dependent(CFFI "" "" OFF "CDAT_BUILD_LEAN" ON)

‎CMake/cdat_modules/click_deps.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(CLICK_deps ${pip_pkg} ${six_pkg} ${ffi_pkg} ${pycparser_pkg} )

‎CMake/cdat_modules/click_external.cmake‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
# create an external project to install MyProxyClient,
3+
# and configure and build it
4+
set(nm CLICK)
5+
6+
include(pipinstaller)

‎CMake/cdat_modules/click_pkg.cmake‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
set(CLICK_MAJOR_SRC 4)
2+
set(CLICK_MINOR_SRC 1)
3+
4+
set(CLICK_VERSION ${CLICK_MAJOR_SRC}.${CLICK_MINOR_SRC})
5+
set(CLICK_GZ click-${CLICK_VERSION}.tar.gz)
6+
set(CLICK_SOURCE ${LLNL_URL}/${CLICK_GZ})
7+
set(CLICK_MD5 6a3fa88c738f2f775ec6de126feb99a4)
8+
9+
if (CDAT_BUILD_ALL)
10+
add_cdat_package(CLICK "" "" ON)
11+
else()
12+
add_cdat_package(CLICK "" "" OFF)
13+
endif()

‎CMake/cdat_modules/cligj_deps.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(CLIGJ_deps ${pip_pkg} ${six_pkg} ${ffi_pkg} ${pycparser_pkg} ${click_pkg} )

‎CMake/cdat_modules/cligj_external.cmake‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
# create an external project to install MyProxyClient,
3+
# and configure and build it
4+
set(nm CLIGJ)
5+
6+
include(pipinstaller)

0 commit comments

Comments
 (0)