diff --git a/.cmake-format b/.cmake-format index e787b251..fcf667d7 100644 --- a/.cmake-format +++ b/.cmake-format @@ -44,8 +44,22 @@ with section("parse"): 'configure_package': { 'pargs': {'nargs': 0}, 'kwargs': { + 'COMPONENT': '?', 'NAMESPACE': '?', 'TARGETS': '*', + 'SUPPORTED_COMPONENTS': '*', + 'DEPENDENCIES': '*', + 'CFG_EXTRAS': '*', + } + }, + 'configure_component': { + 'pargs': {'nargs': 0}, + 'kwargs': { + 'COMPONENT': '?', + 'NAMESPACE': '?', + 'TARGETS': '*', + 'DEPENDENCIES': '*', + 'CFG_EXTRAS': '*', } }, 'add_gtest_discover_tests': { @@ -98,16 +112,66 @@ with section("parse"): 'EXCLUDE': '*', } }, - 'tesseract_cpack': { + 'install_targets': { 'pargs': {'nargs': 0}, 'kwargs': { - 'VERSION': 1, - 'MAINTAINER': 1, - 'DESCRIPTION': 1, - 'LICENSE_FILE': 1, - 'README_FILE': 1, + 'TARGETS': '*', + 'COMPONENT': '?', + } + }, + 'cpack': { + 'pargs': {'nargs': 0}, + 'kwargs': { + 'VERSION': '?', + 'MAINTAINER_NAME': '?', + 'MAINTAINER_EMAIL': '?', + 'VENDOR': '?', + 'DESCRIPTION': '?', + 'LICENSE_FILE': '?', + 'README_FILE': '?', + 'PACKAGE_PREFIX': '?', + 'LINUX_BUILD_DEPENDS': '*', + 'WINDOWS_BUILD_DEPENDS': '*', + 'LINUX_DEPENDS': '*', + 'WINDOWS_DEPENDS': '*', + } + }, + 'cpack_component_package': { + 'pargs': {'nargs': 0}, + 'kwargs': { + 'VERSION': '?', + 'MAINTAINER_NAME': '?', + 'MAINTAINER_EMAIL': '?', + 'VENDOR': '?', + 'DESCRIPTION': '?', + 'LICENSE_FILE': '?', + 'README_FILE': '?', + 'PACKAGE_PREFIX': '?', + 'COMPONENT_DEPENDS': '*', + } + }, + 'cpack_component': { + 'pargs': {'nargs': 0}, + 'kwargs': { + 'COMPONENT': '?', + 'VERSION': '?', + 'DESCRIPTION': '?', + 'PACKAGE_PREFIX': '?', + 'LINUX_BUILD_DEPENDS': '*', + 'WINDOWS_BUILD_DEPENDS': '*', 'LINUX_DEPENDS': '*', 'WINDOWS_DEPENDS': '*', + 'COMPONENT_DEPENDS': '*', + } + }, + 'cpack_debian_source_package': { + 'pargs': {'nargs': 0}, + 'kwargs': { + 'CHANGLELOG': '?', + 'UPLOAD': '?', + 'DPUT_HOST': '?', + 'DEBIAN_INCREMENT': '?', + 'DISTRIBUTIONS': '*', } }, } diff --git a/trajopt/CMakeLists.txt b/trajopt/CMakeLists.txt index 3ade0db7..1e412e39 100644 --- a/trajopt/CMakeLists.txt +++ b/trajopt/CMakeLists.txt @@ -94,36 +94,28 @@ endif() if(TRAJOPT_PACKAGE) cpack( - VERSION - ${pkg_extracted_version} - MAINTAINER - - VENDOR - "ROS-Industrial" - DESCRIPTION - ${pkg_extracted_description} - LICENSE_FILE - "" - README_FILE - ${CMAKE_CURRENT_LIST_DIR}/../README.md - PACKAGE_PREFIX - ${TRAJOPT_PACKAGE_PREFIX} + VERSION ${pkg_extracted_version} MAINTAINER + VENDOR "ROS-Industrial" + DESCRIPTION ${pkg_extracted_description} + LICENSE_FILE "" + README_FILE ${CMAKE_CURRENT_LIST_DIR}/../README.md + PACKAGE_PREFIX ${TRAJOPT_PACKAGE_PREFIX} LINUX_DEPENDS - "libeigen3-dev" - "libboost-dev" - "libconsole-bridge-dev" - "libjsoncpp-dev" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-sco" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" - "${TESSERACT_PACKAGE_PREFIX}tesseract-environment" - "${TESSERACT_PACKAGE_PREFIX}tesseract-visualization" + "libeigen3-dev" + "libboost-dev" + "libconsole-bridge-dev" + "libjsoncpp-dev" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-sco" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" + "${TESSERACT_PACKAGE_PREFIX}tesseract-environment" + "${TESSERACT_PACKAGE_PREFIX}tesseract-visualization" WINDOWS_DEPENDS - "Eigen3" - "boost" - "console-bridge" - "jsoncpp" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-sco" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" - "${TESSERACT_PACKAGE_PREFIX}tesseract-environment" - "${TESSERACT_PACKAGE_PREFIX}tesseract-visualization") + "Eigen3" + "boost" + "console-bridge" + "jsoncpp" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-sco" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" + "${TESSERACT_PACKAGE_PREFIX}tesseract-environment" + "${TESSERACT_PACKAGE_PREFIX}tesseract-visualization") endif() diff --git a/trajopt_common/CMakeLists.txt b/trajopt_common/CMakeLists.txt index 3c475e7c..09beab64 100644 --- a/trajopt_common/CMakeLists.txt +++ b/trajopt_common/CMakeLists.txt @@ -66,26 +66,12 @@ endforeach() if(TRAJOPT_PACKAGE) cpack( - VERSION - ${pkg_extracted_version} - MAINTAINER - - VENDOR - "ROS-Industrial" - DESCRIPTION - ${pkg_extracted_description} - LICENSE_FILE - "" - README_FILE - ${CMAKE_CURRENT_LIST_DIR}/../README.md - PACKAGE_PREFIX - ${TRAJOPT_PACKAGE_PREFIX} - LINUX_DEPENDS - "libeigen3-dev" - "libboost-program-options-dev" - "libboost-serialization-dev" - WINDOWS_DEPENDS - "Eigen3" - "boost-program-options" - "boost_serialization") + VERSION ${pkg_extracted_version} MAINTAINER + VENDOR "ROS-Industrial" + DESCRIPTION ${pkg_extracted_description} + LICENSE_FILE "" + README_FILE ${CMAKE_CURRENT_LIST_DIR}/../README.md + PACKAGE_PREFIX ${TRAJOPT_PACKAGE_PREFIX} + LINUX_DEPENDS "libeigen3-dev" "libboost-program-options-dev" "libboost-serialization-dev" + WINDOWS_DEPENDS "Eigen3" "boost-program-options" "boost_serialization") endif() diff --git a/trajopt_ext/osqp/CMakeLists.txt b/trajopt_ext/osqp/CMakeLists.txt index 88fb17f2..ab395ed0 100644 --- a/trajopt_ext/osqp/CMakeLists.txt +++ b/trajopt_ext/osqp/CMakeLists.txt @@ -29,16 +29,10 @@ if(NOT ${osqp_FOUND}) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_BINARY_DIR}-src;${CMAKE_BINARY_DIR}-build") set(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR}-build;${PROJECT_NAME};ALL;/") cpack( - VERSION - ${pkg_extracted_version} - MAINTAINER - - VENDOR - "ROS-Industrial" - DESCRIPTION - ${pkg_extracted_description} - PACKAGE_PREFIX - ${TRAJOPT_PACKAGE_PREFIX}) + VERSION ${pkg_extracted_version} MAINTAINER + VENDOR "ROS-Industrial" + DESCRIPTION ${pkg_extracted_description} + PACKAGE_PREFIX ${TRAJOPT_PACKAGE_PREFIX}) endif() endif() diff --git a/trajopt_ext/osqp_eigen/CMakeLists.txt b/trajopt_ext/osqp_eigen/CMakeLists.txt index a2d90ad2..67544d74 100644 --- a/trajopt_ext/osqp_eigen/CMakeLists.txt +++ b/trajopt_ext/osqp_eigen/CMakeLists.txt @@ -28,20 +28,12 @@ if(NOT ${OsqpEigen_FOUND}) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_BINARY_DIR}-src;${CMAKE_BINARY_DIR}-build") set(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR}-build;${PROJECT_NAME};ALL;/") cpack( - VERSION - ${pkg_extracted_version} - MAINTAINER - - VENDOR - "ROS-Industrial" - DESCRIPTION - ${pkg_extracted_description} - PACKAGE_PREFIX - ${TRAJOPT_PACKAGE_PREFIX} - LINUX_DEPENDS - "libeigen3-dev" - WINDOWS_DEPENDS - "Eigen3") + VERSION ${pkg_extracted_version} MAINTAINER + VENDOR "ROS-Industrial" + DESCRIPTION ${pkg_extracted_description} + PACKAGE_PREFIX ${TRAJOPT_PACKAGE_PREFIX} + LINUX_DEPENDS "libeigen3-dev" + WINDOWS_DEPENDS "Eigen3") endif() endif() diff --git a/trajopt_ext/qpoases/CMakeLists.txt b/trajopt_ext/qpoases/CMakeLists.txt index 5bf14d99..97494801 100644 --- a/trajopt_ext/qpoases/CMakeLists.txt +++ b/trajopt_ext/qpoases/CMakeLists.txt @@ -31,20 +31,12 @@ if(NOT qpOASES_FOUND) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_BINARY_DIR}-src;${CMAKE_BINARY_DIR}-build") set(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR}-build;${PROJECT_NAME};ALL;/") cpack( - VERSION - ${pkg_extracted_version} - MAINTAINER - - VENDOR - "ROS-Industrial" - DESCRIPTION - ${pkg_extracted_description} - PACKAGE_PREFIX - ${TRAJOPT_PACKAGE_PREFIX} - LINUX_DEPENDS - "libeigen3-dev" - WINDOWS_DEPENDS - "Eigen3") + VERSION ${pkg_extracted_version} MAINTAINER + VENDOR "ROS-Industrial" + DESCRIPTION ${pkg_extracted_description} + PACKAGE_PREFIX ${TRAJOPT_PACKAGE_PREFIX} + LINUX_DEPENDS "libeigen3-dev" + WINDOWS_DEPENDS "Eigen3") endif() endif() diff --git a/trajopt_ifopt/CMakeLists.txt b/trajopt_ifopt/CMakeLists.txt index a541acd3..159fdc79 100644 --- a/trajopt_ifopt/CMakeLists.txt +++ b/trajopt_ifopt/CMakeLists.txt @@ -103,30 +103,23 @@ endif() if(TRAJOPT_PACKAGE) cpack( - VERSION - ${pkg_extracted_version} - MAINTAINER - - VENDOR - "ROS-Industrial" - DESCRIPTION - ${pkg_extracted_description} - README_FILE - ${CMAKE_CURRENT_LIST_DIR}/../README.md - PACKAGE_PREFIX - ${TRAJOPT_PACKAGE_PREFIX} + VERSION ${pkg_extracted_version} MAINTAINER + VENDOR "ROS-Industrial" + DESCRIPTION ${pkg_extracted_description} + README_FILE ${CMAKE_CURRENT_LIST_DIR}/../README.md + PACKAGE_PREFIX ${TRAJOPT_PACKAGE_PREFIX} LINUX_DEPENDS - "libeigen3-dev" - "libboost-dev" - "libconsole-bridge-dev" - "ifopt" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" - "${TESSERACT_PACKAGE_PREFIX}tesseract-environment" + "libeigen3-dev" + "libboost-dev" + "libconsole-bridge-dev" + "ifopt" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" + "${TESSERACT_PACKAGE_PREFIX}tesseract-environment" WINDOWS_DEPENDS - "Eigen3" - "boost" - "console-bridge" - "ifopt" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" - "${TESSERACT_PACKAGE_PREFIX}tesseract-environment") + "Eigen3" + "boost" + "console-bridge" + "ifopt" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" + "${TESSERACT_PACKAGE_PREFIX}tesseract-environment") endif() diff --git a/trajopt_optimizers/trajopt_sqp/CMakeLists.txt b/trajopt_optimizers/trajopt_sqp/CMakeLists.txt index 80ffb6fd..4dab9394 100644 --- a/trajopt_optimizers/trajopt_sqp/CMakeLists.txt +++ b/trajopt_optimizers/trajopt_sqp/CMakeLists.txt @@ -114,34 +114,28 @@ endif() if(TRAJOPT_PACKAGE) cpack( - VERSION - ${pkg_extracted_version} - MAINTAINER - - VENDOR - "ROS-Industrial" - DESCRIPTION - ${pkg_extracted_description} - PACKAGE_PREFIX - ${TRAJOPT_PACKAGE_PREFIX} + VERSION ${pkg_extracted_version} MAINTAINER + VENDOR "ROS-Industrial" + DESCRIPTION ${pkg_extracted_description} + PACKAGE_PREFIX ${TRAJOPT_PACKAGE_PREFIX} LINUX_DEPENDS - "libeigen3-dev" - "libboost-dev" - "libconsole-bridge-dev" - "ifopt" - "${TRAJOPT_PACKAGE_PREFIX}osqpeigen" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-ifopt" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" - "${TESSERACT_PACKAGE_PREFIX}tesseract-common" - "${TESSERACT_PACKAGE_PREFIX}tesseract-visualization" + "libeigen3-dev" + "libboost-dev" + "libconsole-bridge-dev" + "ifopt" + "${TRAJOPT_PACKAGE_PREFIX}osqpeigen" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-ifopt" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" + "${TESSERACT_PACKAGE_PREFIX}tesseract-common" + "${TESSERACT_PACKAGE_PREFIX}tesseract-visualization" WINDOWS_DEPENDS - "Eigen3" - "boost" - "console-bridge" - "ifopt" - "${TRAJOPT_PACKAGE_PREFIX}osqpeigen" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-ifopt" - "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" - "${TESSERACT_PACKAGE_PREFIX}tesseract-common" - "${TESSERACT_PACKAGE_PREFIX}tesseract-visualization") + "Eigen3" + "boost" + "console-bridge" + "ifopt" + "${TRAJOPT_PACKAGE_PREFIX}osqpeigen" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-ifopt" + "${TRAJOPT_PACKAGE_PREFIX}trajopt-common" + "${TESSERACT_PACKAGE_PREFIX}tesseract-common" + "${TESSERACT_PACKAGE_PREFIX}tesseract-visualization") endif() diff --git a/trajopt_sco/CMakeLists.txt b/trajopt_sco/CMakeLists.txt index e3904d33..b4184b1a 100644 --- a/trajopt_sco/CMakeLists.txt +++ b/trajopt_sco/CMakeLists.txt @@ -178,22 +178,12 @@ if(TRAJOPT_PACKAGE) endif() cpack( - VERSION - ${pkg_extracted_version} - MAINTAINER - - VENDOR - "ROS-Industrial" - DESCRIPTION - ${pkg_extracted_description} - LICENSE_FILE - "" - README_FILE - ${CMAKE_CURRENT_LIST_DIR}/../README.md - PACKAGE_PREFIX - ${TRAJOPT_PACKAGE_PREFIX} - LINUX_DEPENDS - ${LINUX_DEPENDS} - WINDOWS_DEPENDS - ${WINDOWS_DEPENDS}) + VERSION ${pkg_extracted_version} MAINTAINER + VENDOR "ROS-Industrial" + DESCRIPTION ${pkg_extracted_description} + LICENSE_FILE "" + README_FILE ${CMAKE_CURRENT_LIST_DIR}/../README.md + PACKAGE_PREFIX ${TRAJOPT_PACKAGE_PREFIX} + LINUX_DEPENDS ${LINUX_DEPENDS} + WINDOWS_DEPENDS ${WINDOWS_DEPENDS}) endif()