From cc6ba0094e170a8fd969fcefd8d6ff8df22da0ea Mon Sep 17 00:00:00 2001

From: Elizaveta Morozova <morozovaes@altlinux.org>

Date: Wed, 19 Jul 2023 16:29:23 +0300

Subject: [PATCH] itk-5.3.0-Cleaver

Avoid using FetchContent for library dependency, use system Cleaver instead.

---

 CMakeLists.txt | 17 +++++------------

 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 0ae91fd..786d85b 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -17,22 +17,17 @@ FetchContent_Declare(

   cleaver_lib

   GIT_REPOSITORY ${cleaver_GIT_REPOSITORY}

   GIT_TAG ${cleaver_GIT_TAG})

-FetchContent_GetProperties(cleaver_lib)

-if(NOT cleaver_lib_POPULATED)

-  FetchContent_Populate(cleaver_lib)

-  add_subdirectory(${cleaver_lib_SOURCE_DIR}/src ${cleaver_lib_BINARY_DIR})

+find_library(CLEAVER NAMES libcleaver.a PATHS /usr/lib /usr/lib64 /usr/lib32)

+

+if(CLEAVER_FOUND)

+ add_library(cleaver STATIC IMPORTED CLEAVER)

 endif()

+

 # Debugging / development, symlink Cleaver2 into the source tree

 #add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Cleaver2/src)

 set(BUILD_TESTING ${_itk_build_testing})

 set(BUILD_SHARED_LIBS ${_itk_build_shared})

-set(Cleaver_LIBRARIES cleaver)

-set(Cleaver_INCLUDE_DIRS

-  ${Cleaver_SOURCE_DIR}/include

-  ${cleaver_lib_SOURCE_DIR}/src/lib

-  )

-

 if(NOT ITK_SOURCE_DIR)

   find_package(ITK REQUIRED)

   list(APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR})

@@ -41,5 +36,3 @@ else()

   set(ITK_DIR ${CMAKE_BINARY_DIR})

   itk_module_impl()

 endif()

-

-itk_module_target(cleaver NO_INSTALL)

--

2.33.8