diff --git a/.travis.yml b/.travis.yml index a35bbdd11f868c577c049c713258421b5276e820..12f04050ff110ea76020d2b14121bdb2629b2cab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,12 +71,26 @@ install: pip install coveralls numpy --user script: - export CMAKE_ADDITIONAL_OPTIONS="-DCMAKE_BUILD_TYPE=${BUILDTYPE}" - ./.travis/run ../travis_custom/custom_build - - cd $TRAVIS_BUILD_DIR/unittest/cmake - - mkdir build - - cd build - - export CMAKE_PREFIX_PATH=/tmp/_ci/install - export PYTHON_DEFAULT_VERSION=$(which python2) - if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then export PYTHON_DEFAULT_VERSION=$(which python3); fi + - export CMAKE_PREFIX_PATH=/tmp/_ci/install + - cd $TRAVIS_BUILD_DIR/unittest/packaging/cmake + - mkdir build + - cd build + - cmake .. -DPYTHON_EXECUTABLE=$PYTHON_DEFAULT_VERSION + - make + - ./extra_lib + - cd $TRAVIS_BUILD_DIR/unittest/packaging/cmake-2x + - mkdir build + - cd build + - cmake .. -DPYTHON_EXECUTABLE=$PYTHON_DEFAULT_VERSION + - make + - ./extra_lib + - cd $TRAVIS_BUILD_DIR/unittest/packaging/pkgconfig + - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/_ci/install/lib + - export PKG_CONFIG_PATH=/tmp/_ci/install/lib/pkgconfig:$PKG_CONFIG_PATH + - mkdir build + - cd build - cmake .. -DPYTHON_EXECUTABLE=$PYTHON_DEFAULT_VERSION - make - ./extra_lib diff --git a/unittest/packaging/cmake-2x/CMakeLists.txt b/unittest/packaging/cmake-2x/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..dadcdb504fa01c0d110f73c97d6e50516ef49c0c --- /dev/null +++ b/unittest/packaging/cmake-2x/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 2.6) + +project(ExtraLib CXX) +find_package(eigenpy REQUIRED) +find_package(PythonInterp REQUIRED) +find_package(PythonLibs REQUIRED) + +include_directories(SYSTEM ${EIGENPY_INCLUDE_DIRS}) +add_executable(extra_lib extra_lib.cpp) +target_link_libraries(extra_lib PUBLIC ${eigenpy_LIBRARIES} ${PYTHON_LIBRARIES}) diff --git a/unittest/cmake/extra_lib.cpp b/unittest/packaging/cmake-2x/extra_lib.cpp similarity index 100% rename from unittest/cmake/extra_lib.cpp rename to unittest/packaging/cmake-2x/extra_lib.cpp diff --git a/unittest/cmake/CMakeLists.txt b/unittest/packaging/cmake/CMakeLists.txt similarity index 100% rename from unittest/cmake/CMakeLists.txt rename to unittest/packaging/cmake/CMakeLists.txt diff --git a/unittest/packaging/cmake/extra_lib.cpp b/unittest/packaging/cmake/extra_lib.cpp new file mode 100644 index 0000000000000000000000000000000000000000..7e5a78bc4a8d7a3e9edd28cb75a5bf73f17c482a --- /dev/null +++ b/unittest/packaging/cmake/extra_lib.cpp @@ -0,0 +1,8 @@ + +#include <eigenpy/version.hpp> + +int main(int /*argc*/, char ** /*argv*/) +{ + eigenpy::checkVersionAtLeast(0,0,0); + return 0; +} diff --git a/unittest/packaging/pkgconfig/CMakeLists.txt b/unittest/packaging/pkgconfig/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..eb62a63b215151d2156e896c3cb02f569d6747f3 --- /dev/null +++ b/unittest/packaging/pkgconfig/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 2.6) + +project(ExtraLib CXX) +find_package(PkgConfig REQUIRED) +pkg_check_modules(EIGENPY REQUIRED eigenpy) +find_package(PythonInterp REQUIRED) +find_package(PythonLibs REQUIRED) + +include_directories(SYSTEM ${EIGENPY_INCLUDE_DIRS}) +add_executable(extra_lib extra_lib.cpp) +target_link_libraries(extra_lib PUBLIC ${EIGENPY_LDFLAGS} ${PYTHON_LIBRARIES}) diff --git a/unittest/packaging/pkgconfig/extra_lib.cpp b/unittest/packaging/pkgconfig/extra_lib.cpp new file mode 100644 index 0000000000000000000000000000000000000000..7e5a78bc4a8d7a3e9edd28cb75a5bf73f17c482a --- /dev/null +++ b/unittest/packaging/pkgconfig/extra_lib.cpp @@ -0,0 +1,8 @@ + +#include <eigenpy/version.hpp> + +int main(int /*argc*/, char ** /*argv*/) +{ + eigenpy::checkVersionAtLeast(0,0,0); + return 0; +}