Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR to make the repository compiled on Humble #44

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

PR to make the repository compiled on Humble #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b5b148
[cmake] Change cmake submodules link to https and synchronize.
olivier-stasse Sep 7, 2024
a78ea21
[cmake] Update CMakeLists.txt to reflect the new changes.
olivier-stasse Sep 7, 2024
e336088
[cmake] Update CMakeLists.txt
olivier-stasse Sep 16, 2024
43a92d0
Add package.xml
olivier-stasse Sep 16, 2024
67d5f7e
Add required dependency of roboptim-core
saikishor Dec 9, 2024
31f2b25
Add missing dependencies and fix package.xml format
saikishor Dec 9, 2024
dda5703
Merge pull request #1 from saikishor/fix/build
olivier-stasse Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
url = git://github.com/roboptim/roboptim-shared-tests.git
[submodule "cmake"]
path = cmake
url = git://github.com/jrl-umi3218/jrl-cmakemodules.git
url = https://github.com/jrl-umi3218/jrl-cmakemodules
[submodule ".travis"]
path = .travis
url = git://github.com/jrl-umi3218/jrl-travis.git
22 changes: 13 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,21 @@
# along with roboptim-core. If not, see <http://www.gnu.org/licenses/>.

# Requires at least CMake 2.8 to configure the package.
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
CMAKE_MINIMUM_REQUIRED(VERSION 3.16)

INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/cpack.cmake)
SET(CMAKE_CXX_STANDARD 11)

SET(PROJECT_NAME roboptim-core-plugin-ipopt)
SET(PROJECT_DESCRIPTION "RobOptim core IPOPT plug-in")
SET(PROJECT_URL "https://github.com/roboptim/roboptim-core-plugin-ipopt")
set(PROJECT_USE_CMAKE_EXPORT TRUE)

INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/cpack.cmake)

compute_project_args(PROJECT_ARGS LANGUAGES CXX C)
project(${PROJECT_NAME} ${PROJECT_ARGS})

# Use MathJax for Doxygen formulae
SET(DOXYGEN_USE_MATHJAX "YES")
Expand All @@ -37,7 +43,6 @@ SET(HEADERS

SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir relplugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES})

SETUP_PROJECT()

# If compiler support symbol visibility, enable it.
INCLUDE(CheckCCompilerFlag)
Expand Down Expand Up @@ -68,8 +73,9 @@ IF (NOT LTDL_H_FOUND)
ENDIF()

# Search for roboptim-core.
ADD_REQUIRED_DEPENDENCY("roboptim-core >= 3.2")

ADD_REQUIRED_DEPENDENCY(roboptim-core)
ADD_PROJECT_DEPENDENCY(roboptim-core)
add_project_dependency(Eigen3)
# Workaround Ipopt package issue.
# It does not define HAVE_STDDEF even when it is needed, so we will do
# it manually.
Expand Down Expand Up @@ -144,5 +150,3 @@ ELSE()
"Tests should only be disabled for speficic cases. Do it at your own risk.")
ENDIF()

SETUP_PROJECT_FINALIZE()
SETUP_PROJECT_CPACK()
2 changes: 1 addition & 1 deletion cmake
Open in desktop
Submodule cmake updated 155 files
20 changes: 20 additions & 0 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<package format="3">
<name>roboptim-core-plugin-ipopt</name>
<version>0.1.0</version>
<description>This plus provides the interface from roboptim to ipopt.</description>

<maintainer email="[email protected]">Guilhem Saurel</maintainer>

<license>BSD</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<build_depend>rclcpp</build_depend>
<build_depend>roboptim-core</build_depend>
<depend>coinor-libipopt-dev</depend>

<exec_depend>rclcpp</exec_depend>
<exec_depend>roboptim-core</exec_depend>

</package>
6 changes: 4 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ MACRO(IPOPT_PLUGIN NAME)
PROPERTIES VERSION 3.2.0 SOVERSION 3)
ENDIF()
INSTALL(TARGETS roboptim-core-plugin-${NAME}
EXPORT ${TARGETS_EXPORT_NAME}
DESTINATION ${PLUGINDIR})
PKG_CONFIG_USE_DEPENDENCY(roboptim-core-plugin-${NAME} ipopt)
PKG_CONFIG_USE_COMPILE_DEPENDENCY(roboptim-core-plugin-${NAME} roboptim-core)

#PKG_CONFIG_USE_COMPILE_DEPENDENCY(roboptim-core-plugin-${NAME} roboptim-core)
TARGET_LINK_LIBRARIES(roboptim-core-plugin-${NAME} roboptim-core::roboptim-core Eigen3::Eigen)

# Make sure all symbols are defined.
# See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592752
IF(CMAKE_SYSTEM_NAME MATCHES "Linux"
Expand Down