Merge pull request #193 from jcarpent/devel

Make the packaging independant from pkg-config

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
     - uses: goanpeca/setup-miniconda@v1
       with:
         activate-environment: eigenpy
-        environment-file: ci/environment.yml
+        environment-file: .github/workflows/conda/environment.yml
         python-version: 3.7
     - name: Build Eigenpy
       shell: cmd /C CALL {0}
@@ -42,8 +42,6 @@ jobs:
           -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
           -DCMAKE_BUILD_TYPE=Release ^
           -DEIGENPY_SITELIB_ROOT=%CONDA_PREFIX% ^
-          -DEIGEN3_FOUND=1 ^
-          -DEIGEN3_INCLUDE_DIRS=%CONDA_PREFIX%\Library\include\eigen3 ^
           -DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^
           ..
         cmake --build . --config Release --target install

.travis.yml

@@ -47,16 +47,6 @@ jobs:
         - BUILDTYPE=Release
         - TRAVIS_PYTHON_VERSION=35 
       python: 3.5
-    - dist: trusty 
-      env: 
-        - BUILDTYPE=Release
-        - TRAVIS_PYTHON_VERSION=27 
-      python: 2.7
-    - dist: trusty 
-      env: 
-        - BUILDTYPE=Release
-        - TRAVIS_PYTHON_VERSION=34
-      python: 3.4
 
 notifications:
   email:

CMakeLists.txt

@@ -63,7 +63,7 @@ ENDIF(WIN32)
 # ----------------------------------------------------
 # --- DEPENDENCIES -----------------------------------
 # ----------------------------------------------------
-ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5")
+ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "eigen3 >= 3.0.5")
 
 SET(BOOST_COMPONENTS python)
 SEARCH_FOR_BOOST()
@@ -183,7 +183,6 @@ ELSE()
 ENDIF()
 
 TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PUBLIC)
-PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3)
 INSTALL(TARGETS ${PROJECT_NAME}
   EXPORT ${TARGETS_EXPORT_NAME}
   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}

unittest/CMakeLists.txt

@@ -3,7 +3,7 @@
 # Copyright (c) 2018-2020 INRIA
 #
 
-MACRO(ADD_LIB_UNIT_TEST test PKGS)
+MACRO(ADD_LIB_UNIT_TEST test)
   CREATE_CTEST_BUILD_TESTS_TARGET()
 
   IF(BUILD_TESTING)
@@ -12,10 +12,6 @@ MACRO(ADD_LIB_UNIT_TEST test PKGS)
     ADD_LIBRARY(${test} SHARED EXCLUDE_FROM_ALL ${test})
   ENDIF(BUILD_TESTING)
 
-  FOREACH(PKG ${PKGS})
-    PKG_CONFIG_USE_DEPENDENCY(${test} ${PKG})
-  ENDFOREACH(PKG)
-
   TARGET_LINK_LIBRARIES(${test} PUBLIC ${PROJECT_NAME})
   SET_TARGET_PROPERTIES(${test} PROPERTIES PREFIX "")
 
@@ -29,14 +25,14 @@ MACRO(ADD_LIB_UNIT_TEST test PKGS)
   ENDIF(NOT BUILD_TESTING)
 ENDMACRO(ADD_LIB_UNIT_TEST)
 
-ADD_LIB_UNIT_TEST(matrix "eigen3")
-ADD_LIB_UNIT_TEST(geometry "eigen3")
-ADD_LIB_UNIT_TEST(complex "eigen3")
-ADD_LIB_UNIT_TEST(return_by_ref "eigen3")
+ADD_LIB_UNIT_TEST(matrix)
+ADD_LIB_UNIT_TEST(geometry)
+ADD_LIB_UNIT_TEST(complex)
+ADD_LIB_UNIT_TEST(return_by_ref)
 IF(NOT ${EIGEN3_VERSION} VERSION_LESS "3.2.0")
-  ADD_LIB_UNIT_TEST(eigen_ref "eigen3")
+  ADD_LIB_UNIT_TEST(eigen_ref)
 ENDIF()
-ADD_LIB_UNIT_TEST(user_type "eigen3")
+ADD_LIB_UNIT_TEST(user_type)
 
 ADD_PYTHON_UNIT_TEST("py-matrix" "unittest/python/test_matrix.py" "unittest")
 ADD_PYTHON_UNIT_TEST("py-geometry" "unittest/python/test_geometry.py" "unittest")