From a85b94d3842404bb5ef7f06eb0f3e9e938dac2c4 Mon Sep 17 00:00:00 2001 From: Julien Jomier <219040+jjomier@users.noreply.github.com> Date: Tue, 15 Oct 2024 10:09:46 -0400 Subject: [PATCH] Reverting back the fetchcontent logic and added policy (#537) Signed-off-by: Julien Jomier --- operators/volume_renderer/CMakeLists.txt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/operators/volume_renderer/CMakeLists.txt b/operators/volume_renderer/CMakeLists.txt index 3cf91e26..e9df8b9c 100644 --- a/operators/volume_renderer/CMakeLists.txt +++ b/operators/volume_renderer/CMakeLists.txt @@ -52,10 +52,21 @@ FetchContent_Declare( # enable CMP0077 to allow overwriting option() statements in FetchContent sub-projects cmake_policy(SET CMP0077 NEW) -FetchContent_MakeAvailable(ClaraViz) -set(CLARA_VIZ_PUBLIC_CMAKE_TOOLS_DIR "${claraviz_SOURCE_DIR}/cmake") -add_subdirectory(${claraviz_SOURCE_DIR}/src ${claraviz_BINARY_DIR}/src) +# Allowing FetchContent_Populate() for now +# This should be updated when ClaraViz supports new version of CMake +if(POLICY CMP0169) + cmake_policy(SET CMP0169 OLD) +endif() +FetchContent_GetProperties(ClaraViz) +if(NOT claraviz_POPULATED) + FetchContent_Populate(ClaraViz) + set(CLARA_VIZ_PUBLIC_CMAKE_TOOLS_DIR "${claraviz_SOURCE_DIR}/cmake") + add_subdirectory(${claraviz_SOURCE_DIR}/thirdparty ${claraviz_BINARY_DIR}/thirdparty) + add_subdirectory(${claraviz_SOURCE_DIR}/src ${claraviz_BINARY_DIR}/src) +endif() + +set(CLARA_VIZ_PUBLIC_CMAKE_TOOLS_DIR "${claraviz_SOURCE_DIR}/cmake") set(FETCHCONTENT_QUIET ON) find_package(clara_viz_renderer REQUIRED HINTS ${claraviz_SOURCE_DIR}/cmake)