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.

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

Moves package to root. #38

Merged
merged 2 commits into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
6 changes: 3 additions & 3 deletions maliput_object/CMakeLists.txt → CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ message(STATUS "\n\n========= Project Configuration ========\n")

set(BUILD_SHARED_LIBS true)

include(${PROJECT_SOURCE_DIR}/../cmake/DefaultCFlags.cmake)
include(${PROJECT_SOURCE_DIR}/../cmake/SanitizersConfig.cmake)
include(${PROJECT_SOURCE_DIR}/cmake/DefaultCFlags.cmake)
include(${PROJECT_SOURCE_DIR}/cmake/SanitizersConfig.cmake)


##############################################################################
Expand Down Expand Up @@ -58,7 +58,7 @@ if(BUILD_TESTING)
find_package(ament_cmake_clang_format REQUIRED)
enable_testing()
add_subdirectory(test)
ament_clang_format(CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../.clang-format)
ament_clang_format(CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format)
endif()

##############################################################################
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion maliput_object/package.xml → package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<version>1.0.0</version>
<description>Maliput Object</description>
<maintainer email="daniel.stonier@tri.global">Daniel Stonier</maintainer>
<license file="../LICENSE">BSD Clause 3</license>
<license file="LICENSE">BSD Clause 3</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<build_depend>ament_cmake_doxygen</build_depend>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export PATH=$PATH:/home/$USER/.local/bin
declare -i CLANGFORMATFAILED=0

pushd $REPO_DIR
ament_clang_format --config=./../.clang-format --reformat || CLANGFORMATFAILED=1
ament_clang_format --config=./.clang-format --reformat || CLANGFORMATFAILED=1
popd

if [ "$CLANGFORMATFAILED" -ne "0" ]; then
Expand Down