Compatibility with conan 2 (#15)

.github/workflows/test.yml

@@ -11,6 +11,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, macOS-latest]
 
+    env:
+      BUILD_TYPE: Release
+
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python
@@ -19,16 +22,17 @@ jobs:
         python-version: '3.x'
     - name: install conan
       run: pip install conan
+    - name: detect conan profile
+      run: conan profile detect --force
     - name: install dependencies
-      run: conan install .
+      run: conan install . --build=missing -s build_type=${{ env.BUILD_TYPE }}
     - name: cmake
-      run: cmake . -DCMAKE_TOOLCHAIN_FILE=./conan_paths.cmake
+      run: cmake . -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
       env:
-        CXX: g++-10
-        FC: gfortran-10
+        FC: gfortran-13
     - name: cmake build
-      run: cmake --build .
+      run: cmake --build . --config ${{ env.BUILD_TYPE }}
     - name: ctest
-      run: ctest
+      run: ctest -C ${{ env.BUILD_TYPE }}
       env:
         CTEST_OUTPUT_ON_FAILURE: 1

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
 project(Himalaya LANGUAGES CXX Fortran)
 
 option(BUILD_EXAMPLES "Build Himalaya examples" ON)
@@ -9,7 +9,7 @@ include(GNUInstallDirs)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
 
 # require an Eigen installation
-find_package(Eigen3 3.0 REQUIRED)
+find_package(Eigen3 3.0 REQUIRED NO_MODULE)
 
 # search for Mathematica
 if(ENABLE_MATHEMATICA)
@@ -83,22 +83,26 @@ set(DSZ_LIBSOURCES
 add_library(DSZ_static STATIC ${DSZ_LIBSOURCES})
 set_target_properties(DSZ_static PROPERTIES OUTPUT_NAME DSZ)
 target_include_directories(DSZ_static
-  PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
   PRIVATE
     ${PRIVATE_HEADERS}
 )
+target_link_libraries(DSZ_static
+  PUBLIC
+    Eigen3::Eigen
+)
 add_library(Himalaya::DSZ::static ALIAS DSZ_static)
 
 # DSZ shared library
 add_library(DSZ_shared SHARED ${DSZ_LIBSOURCES})
 set_target_properties(DSZ_shared PROPERTIES OUTPUT_NAME DSZ)
 target_include_directories(DSZ_shared
-  PUBLIC
-    ${EIGEN3_INCLUDE_DIR}
   PRIVATE
     ${PRIVATE_HEADERS}
 )
+target_link_libraries(DSZ_shared
+  PUBLIC
+    Eigen3::Eigen
+)
 add_library(Himalaya::DSZ::shared ALIAS DSZ_shared)
 
 # Himalaya static library
@@ -107,10 +111,13 @@ set_target_properties(Himalaya_static PROPERTIES OUTPUT_NAME Himalaya)
 target_include_directories(Himalaya_static
   PUBLIC
     ${PUBLIC_HEADERS}
-    ${EIGEN3_INCLUDE_DIR}
   PRIVATE
     ${PRIVATE_HEADERS}
 )
+target_link_libraries(Himalaya_static
+  PUBLIC
+    Eigen3::Eigen
+)
 add_library(Himalaya::Himalaya::static ALIAS Himalaya_static)
 
 # Himalaya shared library
@@ -120,10 +127,13 @@ target_link_libraries(Himalaya_shared PUBLIC DSZ_shared)
 target_include_directories(Himalaya_shared
   PUBLIC
     ${PUBLIC_HEADERS}
-    ${EIGEN3_INCLUDE_DIR}
   PRIVATE
     ${PRIVATE_HEADERS}
 )
+target_link_libraries(Himalaya_shared
+  PUBLIC
+    Eigen3::Eigen
+)
 add_library(Himalaya::Himalaya::shared ALIAS Himalaya_shared)
 
 # generic targets

conanfile.txt

@@ -2,4 +2,5 @@
 eigen/[>=3.1]
 
 [generators]
-cmake_paths
+CMakeDeps
+CMakeToolchain