gtsam: fix CMake imported targets + modernize

recipes/gtsam/all/CMakeLists.txt

@@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 3.15)
 project(cmake_wrapper)
 
 include(conanbuildinfo.cmake)
-conan_basic_setup()
+conan_basic_setup(KEEP_RPATHS)
 
 add_subdirectory("source_subfolder")

recipes/gtsam/all/conandata.yml

@@ -1,14 +1,18 @@
 sources:
-  "4.0.2":
-    url: "https://github.com/borglab/gtsam/archive/4.0.2.tar.gz"
-    sha256: "8770a440f1af98c3f0d9d4dffd568de2d4c21b245e7231e987e26bc236aeb5aa"
   "4.0.3":
     url: "https://github.com/borglab/gtsam/archive/4.0.3.tar.gz"
     sha256: "eaa561749edf7a2d402981828253e28aed6c717dae35738301c5ab23e2595f25"
+  "4.0.2":
+    url: "https://github.com/borglab/gtsam/archive/4.0.2.tar.gz"
+    sha256: "8770a440f1af98c3f0d9d4dffd568de2d4c21b245e7231e987e26bc236aeb5aa"
 patches:
+  "4.0.3":
+    - patch_file: "patches/0001-conan-4.0.3.patch"
+      base_path: "source_subfolder"
+    - patch_file: "patches/0002-macos-rpath-4.0.3.patch"
+      base_path: "source_subfolder"
   "4.0.2":
-    - patch_file: "patches/conan-4.0.2.patch"
+    - patch_file: "patches/0001-conan-4.0.2.patch"
       base_path: "source_subfolder"
-  "4.0.3":
-    - patch_file: "patches/conan-4.0.3.patch"
+    - patch_file: "patches/0002-macos-rpath-4.0.2.patch"
       base_path: "source_subfolder"

recipes/gtsam/all/patches/0002-macos-rpath-4.0.2.patch

@@ -0,0 +1,34 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.0)
+ # new feature to Cmake Version > 2.8.12
+ # Mac ONLY. Define Relative Path on Mac OS
+ if(NOT DEFINED CMAKE_MACOSX_RPATH)
+-  set(CMAKE_MACOSX_RPATH 0)
+ endif()
+
+ # Set the version number for the library
+--- a/gtsam/CMakeLists.txt
++++ b/gtsam/CMakeLists.txt
+@@ -177,9 +177,6 @@ if(WIN32) # Add 'lib' prefix to static library to avoid filename collision with
+ endif()
+
+ if (APPLE AND BUILD_SHARED_LIBS)
+-	set_target_properties(gtsam PROPERTIES
+-		INSTALL_NAME_DIR
+-		"${CMAKE_INSTALL_PREFIX}/lib")
+ endif()
+
+ install(
+--- a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt
++++ b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt
+@@ -16,9 +16,6 @@ if(WIN32)
+ endif()
+
+ if (APPLE)
+-		set_target_properties(metis PROPERTIES
+-			INSTALL_NAME_DIR
+-			"${CMAKE_INSTALL_PREFIX}/lib")
+  endif()
+
+ install(TARGETS metis EXPORT GTSAM-exports LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin)

recipes/gtsam/all/patches/0002-macos-rpath-4.0.3.patch

@@ -0,0 +1,30 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.0)
+ # new feature to Cmake Version > 2.8.12
+ # Mac ONLY. Define Relative Path on Mac OS
+ if(NOT DEFINED CMAKE_MACOSX_RPATH)
+-  set(CMAKE_MACOSX_RPATH 0)
+ endif()
+
+ # Set the version number for the library
+@@ -347,7 +346,6 @@ endif()
+
+ if (APPLE AND BUILD_SHARED_LIBS)
+ 	# Set the default install directory on macOS
+-	set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+ endif()
+
+ ###############################################################################
+--- a/gtsam/3rdparty/metis/libmetis/CMakeLists.txt
++++ b/gtsam/3rdparty/metis/libmetis/CMakeLists.txt
+@@ -16,9 +16,6 @@ if(WIN32)
+ endif()
+
+ if (APPLE)
+-		set_target_properties(metis-gtsam PROPERTIES
+-			INSTALL_NAME_DIR
+-			"${CMAKE_INSTALL_PREFIX}/lib")
+  endif()
+
+ install(TARGETS metis-gtsam EXPORT GTSAM-exports

recipes/gtsam/all/test_package/CMakeLists.txt

@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.1)
 project(test_package)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
+conan_basic_setup(TARGETS)
 
-add_executable(${PROJECT_NAME} test_package.cpp)
+find_package(GTSAM REQUIRED CONFIG)
 
-find_package(GTSAM REQUIRED)
-target_link_libraries(${PROJECT_NAME} GTSAM::gtsam)
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} gtsam)
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)

recipes/gtsam/all/test_package/conanfile.py

@@ -1,16 +1,17 @@
-import os
 from conans import ConanFile, CMake, tools
+import os
+
 
-class gtsamTestConan(ConanFile):
-    settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake", "cmake_find_package"
+class TestPackageConan(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 tools.cross_building(self.settings):
+        if not tools.cross_building(self):
             bin_path = os.path.join("bin", "test_package")
             self.run(bin_path, run_environment=True)

recipes/gtsam/config.yml

@@ -1,5 +1,5 @@
 versions:
-  "4.0.2":
-    folder: all
   "4.0.3":
     folder: all
+  "4.0.2":
+    folder: all