Skip to content

Commit 45d9879

Browse files
committed
Merge pull request #978 from UV-CDAT/udunits-travis-patch
Update udunits2 patch for travis mac builds.
2 parents 53f5376 + bcf9329 commit 45d9879

File tree

2 files changed

+14056
-19558
lines changed

2 files changed

+14056
-19558
lines changed

CMake/cdat_modules/udunits2_external.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ set(udunits_source "${CMAKE_CURRENT_BINARY_DIR}/build/udunits2")
22
set(udunits_install "${cdat_EXTERNALS}")
33

44
set(udunits_patch_command "")
5-
#if(APPLE)
6-
# # Modified configure file to workaround random flex failures
7-
# set(udunits_patch_command
8-
# ${CMAKE_COMMAND} -E copy_if_different
9-
# "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/udunits2_apple_configure.in"
10-
# "${udunits_source}/configure")
11-
#endif()
5+
if(APPLE)
6+
# Modified configure file to workaround random flex failures
7+
set(udunits_patch_command
8+
${CMAKE_COMMAND} -E copy_if_different
9+
"${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/udunits2_apple_configure.in"
10+
"${udunits_source}/configure")
11+
endif()
1212

1313
ExternalProject_Add(udunits2
1414
DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}

0 commit comments

Comments
 (0)