From 6eee97fb0555e8a051a2820c84a55018868db692 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Tue, 11 Mar 2014 20:16:58 +0400 Subject: [PATCH] DSDLC default output directory name was changed to more obvious 'dsdlc_generated' --- .gitignore | 2 +- libuavcan/CMakeLists.txt | 2 +- libuavcan/dsdl_compiler/dsdlc.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5ff5285bdf..a4dcafe51a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ __pycache__ .pydevproject # libuavcan DSDL compiler default output directory -dsdlc_output +dsdlc_generated diff --git a/libuavcan/CMakeLists.txt b/libuavcan/CMakeLists.txt index 041b98cabe..e941b40526 100644 --- a/libuavcan/CMakeLists.txt +++ b/libuavcan/CMakeLists.txt @@ -29,7 +29,7 @@ add_library(uavcan SHARED ${LIBUAVCAN_CXX_FILES}) # DSDSL compiler invocation # set(DSDLC_INPUTS "test/dsdl_test/root_ns_a" "test/dsdl_test/root_ns_b" "${CMAKE_SOURCE_DIR}/../dsdl/uavcan") -set(DSDLC_OUTPUT "include/dsdlc_output") +set(DSDLC_OUTPUT "include/dsdlc_generated") add_custom_target(dsdlc dsdl_compiler/dsdlc.py -v ${DSDLC_INPUTS} -O${DSDLC_OUTPUT} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) add_dependencies(uavcan dsdlc) diff --git a/libuavcan/dsdl_compiler/dsdlc.py b/libuavcan/dsdl_compiler/dsdlc.py index a7d186cd7b..bf64fb53c7 100755 --- a/libuavcan/dsdl_compiler/dsdlc.py +++ b/libuavcan/dsdl_compiler/dsdlc.py @@ -191,7 +191,7 @@ def generate_one_type(t): DESCRIPTION = '''UAVCAN DSDL compiler. Takes an input directory that contains an hierarchy of DSDL definitions and converts it into compatible hierarchy of C++ types for libuavcan.''' -DEFAULT_OUTDIR = './dsdlc_output' +DEFAULT_OUTDIR = './dsdlc_generated' argparser = argparse.ArgumentParser(description=DESCRIPTION) argparser.add_argument('source_dir', nargs='+', help='source directory with DSDL definitions')