From 928cdeebd6f1f0c7852f6cd1ac759ec021a9bca8 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Mon, 15 Jul 2024 16:35:31 -0700 Subject: [PATCH 1/2] Call new morpheus_utils_initialize_install_prefix function to ensure CMAKE_INSTALL_PREFIX is set if needed --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5c246716b..35473b5fd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,8 @@ project(morpheus # This sets some clang specific settings for CUDA prior to calling enable_language(CUDA) morpheus_utils_enable_cuda() +morpheus_utils_initialize_install_prefix(MORPHEUS_USE_CONDA) + rapids_cmake_write_version_file(${CMAKE_BINARY_DIR}/autogenerated/include/morpheus/version.hpp) # Set a default build type if none was specified From ca0e011db76166afdc13a1cb1288c14c3ebde4f6 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Tue, 16 Jul 2024 12:18:58 -0700 Subject: [PATCH 2/2] Adopt nv-morpheus/utilities/#74 --- external/utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/utilities b/external/utilities index 3e5d28d5d8..fb2c9503fb 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit 3e5d28d5d8a3c6aaa42b30608175f684a465478c +Subproject commit fb2c9503fbfdd08503013f712b8bc1e4d9869933