From 6a0e351b35c813756ceb291887d78843b4a7633f Mon Sep 17 00:00:00 2001 From: Esteve Fernandez Date: Mon, 31 Oct 2016 16:17:17 +0100 Subject: [PATCH] Build shared libraries by default, but honor BUILD_SHARED_LIBS --- ament_tools/build_types/ament_cmake.py | 6 ++++++ ament_tools/build_types/cmake.py | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ament_tools/build_types/ament_cmake.py b/ament_tools/build_types/ament_cmake.py index 56b9b00..d24790a 100644 --- a/ament_tools/build_types/ament_cmake.py +++ b/ament_tools/build_types/ament_cmake.py @@ -50,6 +50,12 @@ def argument_preprocessor(self, args): # This requires special handling or argparse will complain about # unrecognized options. args, cmake_args = extract_argument_group(args, '--ament-cmake-args') + + # Build shared libraries by default unless -DBUILD_SHARED_LIBS is passed + # as an argument to CMake + if not any([cmake_arg.startswith('-DBUILD_SHARED_LIBS=') for cmake_arg in cmake_args]): + cmake_args.append('-DBUILD_SHARED_LIBS=ON') + extras = { 'ament_cmake_args': cmake_args, } diff --git a/ament_tools/build_types/cmake.py b/ament_tools/build_types/cmake.py index 4d520f5..62afa3f 100644 --- a/ament_tools/build_types/cmake.py +++ b/ament_tools/build_types/cmake.py @@ -77,6 +77,12 @@ def argument_preprocessor(self, args): # unrecognized options. args, cmake_args = extract_argument_group(args, '--cmake-args') args, ctest_args = extract_argument_group(args, '--ctest-args') + + # Build shared libraries by default unless -DBUILD_SHARED_LIBS is passed + # as an argument to CMake + if not any([cmake_arg.startswith('-DBUILD_SHARED_LIBS=') for cmake_arg in cmake_args]): + cmake_args.append('-DBUILD_SHARED_LIBS=ON') + extras = { 'cmake_args': cmake_args, 'ctest_args': ctest_args,