itk: migrate to Conan v2

recipes/itk/all/conan_cmake_project_include.cmake

@@ -0,0 +1,8 @@
+find_package(double-conversion REQUIRED CONFIG)
+find_package(Eigen3 REQUIRED CONFIG)
+find_package(EXPAT REQUIRED MODULE)
+find_package(JPEG REQUIRED CONFIG)
+find_package(OpenJPEG REQUIRED CONFIG)
+find_package(PNG REQUIRED)
+find_package(TIFF REQUIRED)
+find_package(ZLIB REQUIRED)

recipes/itk/all/conandata.yml

@@ -8,7 +8,15 @@ sources:
 patches:
   "5.1.2":
     - patch_file: "patches/0001-find-conan-packages.patch"
-      base_path: "source_subfolder"
+      patch_description: "inject thirdparties from conan"
+      patch_type: "conan"
+    - patch_file: "patches/0002-inject-openjpeg.patch"
+      patch_description: "inject openjpeg from conan"
+      patch_type: "conan"
   "5.1.0":
     - patch_file: "patches/0001-find-conan-packages.patch"
-      base_path: "source_subfolder"
+      patch_description: "inject thirdparties from conan"
+      patch_type: "conan"
+    - patch_file: "patches/0002-inject-openjpeg.patch"
+      patch_description: "inject openjpeg from conan"
+      patch_type: "conan"

recipes/itk/all/patches/0001-find-conan-packages.patch

@@ -130,19 +130,6 @@
      # When ITK's config is loaded, load HDF5 too.
      set(ITKHDF5_EXPORT_CODE_INSTALL "
  set(HDF5_DIR \"${HDF5_DIR}\")
---- Modules/ThirdParty/OpenJPEG/src/CMakeLists.txt
-+++ Modules/ThirdParty/OpenJPEG/src/CMakeLists.txt
-@@ -4,5 +4,8 @@
- set(ITK3P_INSTALL_RUNTIME_DIR "${ITKOpenJPEG_INSTALL_RUNTIME_DIR}")
- set(ITK3P_INSTALL_LIBRARY_DIR "${ITKOpenJPEG_INSTALL_LIBRARY_DIR}")
- set(ITK3P_INSTALL_ARCHIVE_DIR "${ITKOpenJPEG_INSTALL_ARCHIVE_DIR}")
--add_subdirectory(openjpeg)
--itk_module_target(itkopenjpeg NO_INSTALL)
-+find_package(OpenJPEG REQUIRED)
-+add_library(itkopenjpeg INTERFACE)
-+set_property(TARGET itkopenjpeg PROPERTY INTERFACE_LINK_LIBRARIES openjp2)
-+#target_compile_definitions(itkopenjpeg INTERFACE)
-+install(TARGETS itkopenjpeg EXPORT ${ITK3P_INSTALL_EXPORT_NAME}) 
 --- Modules/ThirdParty/TBB/CMakeLists.txt
 +++ Modules/ThirdParty/TBB/CMakeLists.txt
 @@ -8,14 +8,14 @@ set(ITKTBB_NO_SRC 1)

recipes/itk/all/patches/0002-inject-openjpeg.patch

@@ -0,0 +1,24 @@
+diff --git a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
+index 103eaa9dd5..35ea012fbd 100644
+--- a/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
++++ b/Modules/ThirdParty/OpenJPEG/CMakeLists.txt
+@@ -1,16 +1,7 @@
+ project(ITKOpenJPEG)
+ set(ITKOpenJPEG_THIRD_PARTY 1)
+
+-set(ITKOpenJPEG_INCLUDE_DIRS
+-  ${ITKOpenJPEG_BINARY_DIR}/src/openjpeg
+-  ${ITKOpenJPEG_SOURCE_DIR}/src/openjpeg
+-  )
+-set(ITKOpenJPEG_LIBRARIES itkopenjpeg)
+-set(ITK_LIBRARY_PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS FALSE)
+-
++find_package(OpenJPEG REQUIRED CONFIG)
++set(ITKOpenJPEG_LIBRARIES openjp2)
++set(ITKOpenJPEG_NO_SRC 1)
+ itk_module_impl()
+-
+-install(FILES ${ITKOpenJPEG_SOURCE_DIR}/src/itk_openjpeg.h
+-  DESTINATION ${ITKOpenJPEG_INSTALL_INCLUDE_DIR}
+-  COMPONENT Development
+-  )

recipes/itk/all/test_package/CMakeLists.txt

@@ -1,12 +1,13 @@
-cmake_minimum_required(VERSION 3.1)
-project(test_package)
+cmake_minimum_required(VERSION 3.15)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
+project(test_package CXX)
 
 find_package(ITK REQUIRED CONFIG)
+#todo: add REQUIRED after removal of test_v1_package
 find_package(HDF5 COMPONENTS CXX)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} ITKCommon hdf5::hdf5_cpp)
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)
+target_link_libraries(${PROJECT_NAME} PRIVATE ITKCommon hdf5::hdf5_cpp)
+#itksys is already linked through dependencies of ITKCommon but we also want to check name alias
+target_link_libraries(${PROJECT_NAME} PRIVATE ITK::itksys)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)

recipes/itk/all/test_package/conanfile.py

@@ -1,17 +1,26 @@
-from conans import ConanFile, CMake, tools
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import cmake_layout, CMake
 import os
 
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "cmake", "cmake_find_package_multi"
+    generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def layout(self):
+        cmake_layout(self)
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self):
-            bin_path = os.path.join("bin", "test_package")
-            self.run(bin_path, run_environment=True)
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
+            self.run(bin_path, env="conanrun")

recipes/itk/all/test_v1_package/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.15)
+project(test_package)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup(TARGETS)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package/)

recipes/itk/all/test_v1_package/conanfile.py

@@ -0,0 +1,18 @@
+from conans import ConanFile, CMake
+from conan.tools.build import cross_building
+import os
+
+
+class TestPackageV1Conan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "cmake", "cmake_find_package_multi"
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if not cross_building(self):
+            bin_path = os.path.join("bin", "test_package")
+            self.run(bin_path, run_environment=True)