Skip to content

Commit

Permalink
cmake-format ALL the files
Browse files Browse the repository at this point in the history
  • Loading branch information
poggenhans committed Feb 24, 2020
1 parent a2949fe commit 0a23aea
Show file tree
Hide file tree
Showing 43 changed files with 1,596 additions and 1,518 deletions.
50 changes: 50 additions & 0 deletions .cmake-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
tab_size: 4
line_width: 120
enable_markup: False
additional_commands:
mrt_add_executable:
pargs: 1
kwargs:
FOLDER: "*"
FILES: "*"
DEPENDS: "*"
LIBRARIES: "*"
mrt_add_links:
pargs: 1
flags: [CUDA, NO_SANITIZER, TEST]
_mrt_export_package:
kwargs:
EXPORTS: "*"
TARGETS: "*"
LIBRARIES: "*"
mrt_add_nodelet:
pargs: 1
kwargs:
FOLDER: "*"
TARGETNAME: "*"
DEPENDS: "*"
LIBRARIES: "*"
mrt_add_library:
pargs: 1
kwargs:
INCLUDES: "*"
SOURCES: "*"
DEPENDS: "*"
LIBRARIES: "*"
_mrt_export_package:
kwargs:
EXPORTS: "*"
TARGETS: "*"
LIBRARIES: "*"
_mrt_run_test:
pargs: 3
flags: [REDIRECT_STDERR]
kwargs:
COMMAND: "*"
COVERAGE_DIR: "*"
configure_package_config_file:
pargs: 2
flags: [NO_SET_AND_CHECK_MACRO, NO_CHECK_REQUIRED_COMPONENTS_MACRO]
kwargs:
INSTALL_DESTINATION: "*"

8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ find_package(catkin REQUIRED)

catkin_package(CFG_EXTRAS mrt_cmake_modules-extras.cmake)

## Install all cmake files
# Install all cmake files
install(DIRECTORY cmake DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(PROGRAMS scripts/generate_cmake_dependency_file.py scripts/init_coverage.py scripts/eval_coverage.py scripts/run_test.py
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts)
install(PROGRAMS scripts/generate_cmake_dependency_file.py scripts/init_coverage.py scripts/eval_coverage.py
scripts/run_test.py DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts)
install(PROGRAMS scripts/generate_cmakelists.py DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
install(FILES yaml/cmake.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/yaml)
install(FILES ci_templates/CMakeLists.txt DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

# Make sure the same test targets exist as in other projects. This is so that "catkin run_tests" works, etc.
if (CATKIN_ENABLE_TESTING)
if(CATKIN_ENABLE_TESTING)
if(NOT TARGET tests)
add_custom_target(tests)
endif()
Expand Down
7 changes: 6 additions & 1 deletion cmake/Modules/CatkinMockForConan.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,20 @@ set(CATKIN_DEVEL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})
set(${PROJECT_NAME}_CATKIN_PACKAGE True) # avoids that export cmake files are generated, conan does this

function(catkin_package)

endfunction()
function(catkin_package_xml)

endfunction()
function(catkin_install_python programs)
cmake_parse_arguments(ARG "OPTIONAL" "DESTINATION" "" ${ARGN})
if(ARG_OPTIONAL)
set(optional_flag "OPTIONAL")
endif()
foreach(file ${ARG_UNPARSED_ARGUMENTS})
install(PROGRAMS "${file}" DESTINATION "${ARG_DESTINATION}" ${optional_flag})
install(
PROGRAMS "${file}"
DESTINATION "${ARG_DESTINATION}"
${optional_flag})
endforeach()
endfunction()
81 changes: 32 additions & 49 deletions cmake/Modules/ExportPackage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ function(_mrt_export_package)
if(EXISTS ${extras_base_name})
message(STATUS "Installing extras file '${PROJECT_NAME}-extras.cmake'")
configure_file(${extras_base_name}
${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}-extras.cmake
COPYONLY
)
install(FILES ${extras_base_name}
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
)
${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}-extras.cmake COPYONLY)
install(FILES ${extras_base_name} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
# _mrt_extras_file is expected by the config.cmake
set(_mrt_extras_file ${PROJECT_NAME}-extras.cmake)
elseif(EXISTS ${extras_base_name}.in)
Expand All @@ -27,24 +23,22 @@ function(_mrt_export_package)
set(PKG_CMAKE_DIR ${PROJECT_SPACE_DIR}/share/${PROJECT_NAME}/cmake)
set(PKG_INCLUDE_PREFIX ${CMAKE_CURRENT_SOURCE_DIR})
configure_file(${extras_base_name}.in
${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}-extras.cmake
@ONLY
)
${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}-extras.cmake @ONLY)
set(DEVELSPACE FALSE)
set(INSTALLSPACE TRUE)
set(PROJECT_SPACE_DIR ${CMAKE_INSTALL_PREFIX})
set(PKG_CMAKE_DIR "\${${PROJECT_NAME}_DIR}")
set(PKG_INCLUDE_PREFIX "\\\${prefix}")
configure_file(${extras_base_name}.in
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}-extras.cmake
@ONLY
)
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}-extras.cmake @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}-extras.cmake
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
)
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
set(_mrt_extras_file ${PROJECT_NAME}-extras.cmake)
elseif(EXISTS ${extras_base_name}.em)
message(FATAL_ERROR "The project contains a ${extras_base_name}.em file. These are not supported by mrt_cmake_modules. Please use ${extras_base_name}.in!")
message(
FATAL_ERROR
"The project contains a ${extras_base_name}.em file. These are not supported by mrt_cmake_modules. Please use ${extras_base_name}.in!"
)
endif()

# if we dont export something but still have messages or action files that generate a header, we build a dummy
Expand All @@ -67,15 +61,15 @@ function(_mrt_export_package)
list(APPEND _mrt_libraries ${PROJECT_NAME}::${lib})
endforeach()
set(_mrt_targets ${ARG_TARGETS})
export(EXPORT ${ARG_EXPORTS}
export(
EXPORT ${ARG_EXPORTS}
FILE ${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}Targets.cmake
NAMESPACE ${PROJECT_NAME}::
)
install(EXPORT ${ARG_EXPORTS}
NAMESPACE ${PROJECT_NAME}::)
install(
EXPORT ${ARG_EXPORTS}
FILE ${PROJECT_NAME}Targets.cmake
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
NAMESPACE ${PROJECT_NAME}::
)
NAMESPACE ${PROJECT_NAME}::)
# create alias targets for multi-project builds
foreach(lib ${ARG_LIBRARIES})
add_library(${PROJECT_NAME}::${lib} ALIAS ${lib})
Expand All @@ -84,52 +78,41 @@ function(_mrt_export_package)

include(CMakePackageConfigHelpers)
# generate the config file that includes the exports
configure_package_config_file(${MCM_TEMPLATE_DIR}/packageConfig.cmake.in
configure_package_config_file(
${MCM_TEMPLATE_DIR}/packageConfig.cmake.in
"${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}Config.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake"
NO_SET_AND_CHECK_MACRO
NO_CHECK_REQUIRED_COMPONENTS_MACRO
)
NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO)
# generate the version file for the config file
write_basic_package_version_file(
"${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
VERSION "${${PROJECT_NAME}_VERSION}"
COMPATIBILITY AnyNewerVersion
)
install(FILES
"${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake"
)
COMPATIBILITY AnyNewerVersion)
install(FILES "${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake")

# "install" the autodeps file to the devel folder
configure_file(${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/auto_dep_vars.cmake
${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/auto_dep_vars.cmake
COPYONLY
)
${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/auto_dep_vars.cmake COPYONLY)
# "install" AutoDepsConfig file to the devel folder
configure_file(${MRT_CMAKE_MODULES_CMAKE_PATH}/Modules/FindAutoDeps.cmake
${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}AutoDepsConfig.cmake
COPYONLY
)
${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}AutoDepsConfig.cmake COPYONLY)

# install the configuration and dependency file file
install(FILES
"${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}Config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/auto_dep_vars.cmake"
"${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}AutoDepsConfig.cmake"
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
)
install(
FILES "${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}Config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/auto_dep_vars.cmake"
"${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}AutoDepsConfig.cmake"
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)

# install cmake files
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/
install(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
PATTERN "${PROJECT_NAME}-extras.cmake*" EXCLUDE
)
PATTERN "${PROJECT_NAME}-extras.cmake*" EXCLUDE)
endif()

# install package.xml
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}
)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME})
endfunction()
3 changes: 1 addition & 2 deletions cmake/Modules/FindANN.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ find_path(ANN_INCLUDE_DIR NAMES ${PACKAGE_HEADER_FILES})
find_library(ANN_LIBRARIES NAMES ${PACKAGE_LIBRARIES})

include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ANN FOUND_VAR ANN_FOUND REQUIRED_VARS ANN_INCLUDE_DIR ANN_LIBRARIES)

find_package_handle_standard_args(ANN FOUND_VAR ANN_FOUND REQUIRED_VARS ANN_INCLUDE_DIR ANN_LIBRARIES)
1 change: 0 additions & 1 deletion cmake/Modules/FindAravis.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Aravis DEFAULT_MSG PC_ARAVIS_LIBRARIES PC_ARAVIS_LIBRARY_DIRS PC_ARAVIS_INCLUDE_DIRS)

mark_as_advanced(Aravis_LIBRARIES Aravis_INCLUDE_DIRS)

Loading

0 comments on commit 0a23aea

Please sign in to comment.