From 2cbc01fa9e9b08e5ad4889a62bd4913d459f419d Mon Sep 17 00:00:00 2001
From: Pierre Fernbach <pierre.fernbach@gmail.com>
Date: Tue, 26 May 2020 11:28:10 +0200
Subject: [PATCH] Change folder structure and installation directory of python
files
---
CMakeLists.txt | 78 +++++--------------
anymal_rbprm/__init__.py | 0
.../anymal/robot.py => anymal_rbprm/anymal.py | 0
.../anymal_abstract.py | 0
.../anymal_contact6D.py | 0
cmake | 2 +-
src/hpp/corbaserver/rbprm/anymal/__init__.py | 5 --
.../rbprm/anymal_abstract/__init__.py | 5 --
.../rbprm/anymal_contact6D/__init__.py | 5 --
9 files changed, 21 insertions(+), 74 deletions(-)
create mode 100644 anymal_rbprm/__init__.py
rename src/hpp/corbaserver/rbprm/anymal/robot.py => anymal_rbprm/anymal.py (100%)
rename src/hpp/corbaserver/rbprm/anymal_abstract/robot.py => anymal_rbprm/anymal_abstract.py (100%)
rename src/hpp/corbaserver/rbprm/anymal_contact6D/robot.py => anymal_rbprm/anymal_contact6D.py (100%)
delete mode 100644 src/hpp/corbaserver/rbprm/anymal/__init__.py
delete mode 100644 src/hpp/corbaserver/rbprm/anymal_abstract/__init__.py
delete mode 100644 src/hpp/corbaserver/rbprm/anymal_contact6D/__init__.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3a3536..dd70c4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,73 +1,35 @@
-# Copyright (c) 2012 CNRS
-# Author: Florent Lamiraux
-#
-# This file is part of hpp-rbprm-corba.
-# hpp-rbprm-corba is free software: you can redistribute it
-# and/or modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation, either version
-# 3 of the License, or (at your option) any later version.
-#
-# hpp-rbprm-corba is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Lesser Public License for more details. You should have
-# received a copy of the GNU Lesser General Public License along with
-# hpp-rbprm-corba. If not, see
-# <http://www.gnu.org/licenses/>.
-
-# Requires at least CMake 2.6 to configure the package.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
-SET(CXX_DISABLE_WERROR true)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
SET(PROJECT_NAME anymal-rbprm)
SET(PROJECT_DESCRIPTION "Database for anymal robot using hpp-rbprm")
SET(PROJECT_URL "")
+SET(CUSTOM_HEADER_DIR "hpp/anymal-rbprm")
+SET(CXX_DISABLE_WERROR true)
+SET(PROJECT_USE_CMAKE_EXPORT TRUE)
-INCLUDE(cmake/base.cmake)
-INCLUDE(cmake/idl.cmake)
+INCLUDE(cmake/hpp.cmake)
INCLUDE(cmake/python.cmake)
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
+PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
-SET(CUSTOM_HEADER_DIR "hpp/anymal-rbprm")
-
-SETUP_PROJECT ()
-
-# search for python
FINDPYTHON()
-PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
+ADD_LIBRARY(${PROJECT_NAME} INTERFACE)
+INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)
-SET(CATKIN_PACKAGE_SHARE_DESTINATION
- ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME})
-
+install(DIRECTORY data/ DESTINATION share/${PROJECT_NAME} )
-SET(CATKIN_PACKAGE_SHARE_DESTINATION
- ${CMAKE_INSTALL_DATAROOTDIR}/anymal-rbprm)
-
-
-install(DIRECTORY
- data/
- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
- )
-
-
-install (FILES
- src/hpp/corbaserver/rbprm/anymal/robot.py
- src/hpp/corbaserver/rbprm/anymal/__init__.py
- DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/rbprm/anymal)
-
-
-install (FILES
- src/hpp/corbaserver/rbprm/anymal_contact6D/robot.py
- src/hpp/corbaserver/rbprm/anymal_contact6D/__init__.py
- DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/rbprm/anymal_contact6D)
-
-install (FILES
- src/hpp/corbaserver/rbprm/anymal_abstract/robot.py
- src/hpp/corbaserver/rbprm/anymal_abstract/__init__.py
- DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/rbprm/anymal_abstract)
+STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
+SET(${PROJECT_NAME}_PYTHON_FILES
+ __init__.py
+ anymal.py
+ anymal_abstract.py
+ anymal_contact6D.py
+ )
-SETUP_PROJECT_FINALIZE()
+FOREACH(SOURCE ${${PROJECT_NAME}_PYTHON_FILES})
+ PYTHON_INSTALL_ON_SITE(${PY_NAME} ${SOURCE})
+ENDFOREACH(SOURCE ${${PROJECT_NAME}_PYTHON_SOURCES})
diff --git a/anymal_rbprm/__init__.py b/anymal_rbprm/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/hpp/corbaserver/rbprm/anymal/robot.py b/anymal_rbprm/anymal.py
similarity index 100%
rename from src/hpp/corbaserver/rbprm/anymal/robot.py
rename to anymal_rbprm/anymal.py
diff --git a/src/hpp/corbaserver/rbprm/anymal_abstract/robot.py b/anymal_rbprm/anymal_abstract.py
similarity index 100%
rename from src/hpp/corbaserver/rbprm/anymal_abstract/robot.py
rename to anymal_rbprm/anymal_abstract.py
diff --git a/src/hpp/corbaserver/rbprm/anymal_contact6D/robot.py b/anymal_rbprm/anymal_contact6D.py
similarity index 100%
rename from src/hpp/corbaserver/rbprm/anymal_contact6D/robot.py
rename to anymal_rbprm/anymal_contact6D.py
diff --git a/cmake b/cmake
index 2de34ad..0ec0f54 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 2de34adfce816937d2403cb602261ade0c26f0cd
+Subproject commit 0ec0f542c02839bcbdf1faa8f5a4559dcf8632ec
diff --git a/src/hpp/corbaserver/rbprm/anymal/__init__.py b/src/hpp/corbaserver/rbprm/anymal/__init__.py
deleted file mode 100644
index 7c4e3a8..0000000
--- a/src/hpp/corbaserver/rbprm/anymal/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2019 CNRS
-# Author : Pierre Fernbach
-
-from .robot import Robot
diff --git a/src/hpp/corbaserver/rbprm/anymal_abstract/__init__.py b/src/hpp/corbaserver/rbprm/anymal_abstract/__init__.py
deleted file mode 100644
index 7c4e3a8..0000000
--- a/src/hpp/corbaserver/rbprm/anymal_abstract/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2019 CNRS
-# Author : Pierre Fernbach
-
-from .robot import Robot
diff --git a/src/hpp/corbaserver/rbprm/anymal_contact6D/__init__.py b/src/hpp/corbaserver/rbprm/anymal_contact6D/__init__.py
deleted file mode 100644
index 7c4e3a8..0000000
--- a/src/hpp/corbaserver/rbprm/anymal_contact6D/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2019 CNRS
-# Author : Pierre Fernbach
-
-from .robot import Robot
--
GitLab