Commit 98dc108a authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[CMake] drop pkg-config

parent c357f236
# #
# Copyright (c) 2017-2020 CNRS # Copyright (c) 2017-2021 CNRS
# #
# This file is part of tsid # This file is part of tsid
# tsid is free software: you can redistribute it # tsid is free software: you can redistribute it
...@@ -72,10 +72,8 @@ ENDIF(EIGEN_NO_AUTOMATIC_RESIZING) ...@@ -72,10 +72,8 @@ ENDIF(EIGEN_NO_AUTOMATIC_RESIZING)
CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE) CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
# Project dependencies # Project dependencies
ADD_PROJECT_DEPENDENCY(pinocchio 2.3.1 REQUIRED ADD_PROJECT_DEPENDENCY(pinocchio 2.3.1 REQUIRED)
PKG_CONFIG_REQUIRES "pinocchio >= 2.3.1") ADD_PROJECT_DEPENDENCY(eiquadprog 1.1.3 REQUIRED)
ADD_PROJECT_DEPENDENCY(eiquadprog 1.1.3 REQUIRED
PKG_CONFIG_REQUIRES "eiquadprog >= 1.1.3")
IF(BUILD_TESTING) IF(BUILD_TESTING)
FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework) FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework)
...@@ -84,7 +82,7 @@ ENDIF(BUILD_TESTING) ...@@ -84,7 +82,7 @@ ENDIF(BUILD_TESTING)
IF(BUILD_PYTHON_INTERFACE) IF(BUILD_PYTHON_INTERFACE)
FINDPYTHON() FINDPYTHON()
SET(PYWRAP ${PROJECT_NAME}_pywrap) SET(PYWRAP ${PROJECT_NAME}_pywrap)
ADD_PROJECT_DEPENDENCY(eigenpy REQUIRED PKG_CONFIG_REQUIRES eigenpy) ADD_PROJECT_DEPENDENCY(eigenpy REQUIRED)
SEARCH_FOR_BOOST_PYTHON(REQUIRED) SEARCH_FOR_BOOST_PYTHON(REQUIRED)
ENDIF(BUILD_PYTHON_INTERFACE) ENDIF(BUILD_PYTHON_INTERFACE)
...@@ -277,7 +275,6 @@ IF(BUILD_TESTING) ...@@ -277,7 +275,6 @@ IF(BUILD_TESTING)
ENDIF(BUILD_TESTING) ENDIF(BUILD_TESTING)
# --- PACKAGING ---------------------------------------------------------------- # --- PACKAGING ----------------------------------------------------------------
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
IF(NOT INSTALL_PYTHON_INTERFACE_ONLY) IF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME}) INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME})
ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY) ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment