Skip to content

Commit

Permalink
Renamed lib to common.
Browse files Browse the repository at this point in the history
Refined CMakeLists.txt

Signed-off-by: TaikiYamada4 <[email protected]>
  • Loading branch information
TaikiYamada4 committed Oct 28, 2024
1 parent b405d14 commit 4570bbf
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 23 deletions.
5 changes: 4 additions & 1 deletion map/autoware_lanelet2_map_validator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ include_directories(
src
)

file(GLOB_RECURSE autoware_lanelet2_map_validator_lib_src src/*.cpp)
file(GLOB_RECURSE autoware_lanelet2_map_validator_lib_src
src/common/*.cpp
src/validators/*.cpp
)
ament_auto_add_library(autoware_lanelet2_map_validator_lib SHARED
${autoware_lanelet2_map_validator_lib_src}
)
Expand Down
2 changes: 1 addition & 1 deletion map/autoware_lanelet2_map_validator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ When the `input_requirements` is thrown to `autoware_lanelet2_map_validator`, it
### Available validators

Since there will be hundreds of validators in the future, the documents for each validator should categorized in the docs file.
The directory structure should be the same to that of the `src/lib/validators` directory.
The directory structure should be the same to that of the `src/validators` directory.

#### Stop Line

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "lib/cli.hpp"
#include "common/cli.hpp"

namespace po = boost::program_options;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef LIB__CLI_HPP_
#define LIB__CLI_HPP_
#ifndef COMMON__CLI_HPP_
#define COMMON__CLI_HPP_

#include <boost/program_options.hpp>

Expand Down Expand Up @@ -42,4 +42,4 @@ MetaConfig parseCommandLine(int argc, const char * argv[]);
} // namespace autoware
} // namespace lanelet

#endif // LIB__CLI_HPP_
#endif // COMMON__CLI_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef LIB__UTILS_HPP_
#define LIB__UTILS_HPP_
#ifndef COMMON__UTILS_HPP_
#define COMMON__UTILS_HPP_

#include <lanelet2_validation/Validation.h>
#include <lanelet2_validation/ValidatorFactory.h>
Expand Down Expand Up @@ -82,4 +82,4 @@ void checkPrimitivesType(
} // namespace autoware
} // namespace lanelet

#endif // LIB__UTILS_HPP_
#endif // COMMON__UTILS_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "lib/validation.hpp"
#include "common/validation.hpp"

#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
#include <autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef LIB__VALIDATION_HPP_
#define LIB__VALIDATION_HPP_
#ifndef COMMON__VALIDATION_HPP_
#define COMMON__VALIDATION_HPP_

#include "lib/cli.hpp"
#include "lib/utils.hpp"
#include "common/cli.hpp"
#include "common/utils.hpp"

#include <lanelet2_io/Io.h>
#include <lanelet2_projection/UTM.h>
Expand Down Expand Up @@ -49,4 +49,4 @@ std::vector<lanelet::validation::DetectedIssues> validateMap(const MetaConfig &
} // namespace autoware
} // namespace lanelet

#endif // LIB__VALIDATION_HPP_
#endif // COMMON__VALIDATION_HPP_
6 changes: 3 additions & 3 deletions map/autoware_lanelet2_map_validator/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "common/cli.hpp"
#include "common/utils.hpp"
#include "common/validation.hpp"
#include "lanelet2_validation/Validation.h"
#include "lib/cli.hpp"
#include "lib/utils.hpp"
#include "lib/validation.hpp"

#include <nlohmann/json.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "lib/utils.hpp"
#include "common/utils.hpp"
#include "validators/crosswalk/missing_regulatory_elements_for_crosswalks.hpp"

#include <range/v3/view/filter.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "validators/crosswalk/regulatory_element_details_for_crosswalks.hpp"

#include "lib/utils.hpp"
#include "common/utils.hpp"

#include <autoware_lanelet2_extension/regulatory_elements/crosswalk.hpp>
#include <range/v3/view/filter.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "validators/stop_line/missing_regulatory_elements_for_stop_lines.hpp"

#include "lib/utils.hpp"
#include "common/utils.hpp"

#include <range/v3/view/filter.hpp>
#include <range/v3/view/transform.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "validators/traffic_light/missing_regulatory_elements_for_traffic_lights.hpp"

#include "lib/utils.hpp"
#include "common/utils.hpp"

#include <range/v3/view/filter.hpp>
#include <range/v3/view/transform.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "validators/traffic_light/regulatory_element_details_for_traffic_lights.hpp"

#include "lib/utils.hpp"
#include "common/utils.hpp"

#include <range/v3/view/filter.hpp>

Expand Down

0 comments on commit 4570bbf

Please sign in to comment.