From 18a7cb61ed611609d3ea03dafacfce9a137c2e67 Mon Sep 17 00:00:00 2001 From: Mark A Potts Date: Thu, 23 Jun 2022 09:15:24 -0400 Subject: [PATCH 1/3] updated ufs utils hash --- Externals.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 57733effce..4552ebcf4d 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -12,8 +12,8 @@ required = True protocol = git repo_url = https://github.com/ufs-community/UFS_UTILS # Specify either a branch name or a hash but not both. -#branch = develop -hash = 31271f7 +branch = ufs_utils_1_7_0 +#hash = 1730d37 local_path = src/UFS_UTILS required = True From 44f8232421a41dec86acc13d35f1a53160b95888 Mon Sep 17 00:00:00 2001 From: Mark A Potts Date: Thu, 23 Jun 2022 09:20:13 -0400 Subject: [PATCH 2/3] updated from tag to hash --- Externals.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 4552ebcf4d..6d13a7c664 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -12,8 +12,8 @@ required = True protocol = git repo_url = https://github.com/ufs-community/UFS_UTILS # Specify either a branch name or a hash but not both. -branch = ufs_utils_1_7_0 -#hash = 1730d37 +#branch = develop +hash = 1730d37 local_path = src/UFS_UTILS required = True From a5b1004d49037ebd22192c02c54150f854f2c438 Mon Sep 17 00:00:00 2001 From: Mark A Potts Date: Thu, 23 Jun 2022 11:11:40 -0400 Subject: [PATCH 3/3] turning off testing in UFS_UTILS --- src/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a6e495bbfd..52bf1be723 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,10 +1,14 @@ include(ExternalProject) +list(APPEND UFS_UTILS_ARGS + "-DBUILD_TESTING=OFF" + "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" +) ExternalProject_Add(UFS_UTILS PREFIX ${CMAKE_CURRENT_BINARY_DIR}/UFS_UTILS SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/UFS_UTILS INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" + CMAKE_ARGS ${UFS_UTILS_ARGS} BUILD_ALWAYS TRUE )