From 058080fe0eec35c75e9954a5fa90105c9fdcafcf Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Thu, 9 Nov 2023 09:19:03 -0600
Subject: [PATCH] Install compiled libraries only to 'lib' (#195)

* Install compiled libraries only to 'lib'

The current behavior results in duplicate libraries installed to both
the Python module in libdir and also into the global lib directory for
the prefix.

The former seems unnecessary, so we should install the libraries only to
lib.

Signed-off-by: Scott K Logan <logans@cottsay.net>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
---
 ...idl_generator_py_generate_interfaces.cmake | 38 ++++---------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake
index a6d8263e..0a72e416 100644
--- a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake
+++ b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake
@@ -142,23 +142,6 @@ set_property(
   ${_generated_extension_files} ${_generated_py_files} ${_generated_c_files}
   PROPERTY GENERATED 1)
 
-macro(set_properties _build_type)
-  set_target_properties(${_target_name} PROPERTIES
-    COMPILE_OPTIONS "${_extension_compile_flags}"
-    PREFIX ""
-    LIBRARY_OUTPUT_DIRECTORY${_build_type} ${_output_path}
-    RUNTIME_OUTPUT_DIRECTORY${_build_type} ${_output_path}
-    OUTPUT_NAME "${PROJECT_NAME}_s__${_typesupport_impl}${PythonExtra_EXTENSION_SUFFIX}"
-    SUFFIX "${PythonExtra_EXTENSION_EXTENSION}")
-endmacro()
-
-macro(set_lib_properties _build_type)
-  set_target_properties(${_target_name_lib} PROPERTIES
-    COMPILE_OPTIONS "${_extension_compile_flags}"
-    LIBRARY_OUTPUT_DIRECTORY${_build_type} ${_output_path}
-    RUNTIME_OUTPUT_DIRECTORY${_build_type} ${_output_path})
-endmacro()
-
 # Export target so downstream interface packages can link to it
 set(rosidl_generator_py_suffix "__rosidl_generator_py")
 
@@ -236,13 +219,11 @@ foreach(_typesupport_impl ${_typesupport_impls})
   if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(_extension_compile_flags -Wall -Wextra)
   endif()
-  set_properties("")
-  if(WIN32)
-    set_properties("_DEBUG")
-    set_properties("_MINSIZEREL")
-    set_properties("_RELEASE")
-    set_properties("_RELWITHDEBINFO")
-  endif()
+  set_target_properties(${_target_name} PROPERTIES
+    COMPILE_OPTIONS "${_extension_compile_flags}"
+    PREFIX ""
+    OUTPUT_NAME "${PROJECT_NAME}_s__${_typesupport_impl}${PythonExtra_EXTENSION_SUFFIX}"
+    SUFFIX "${PythonExtra_EXTENSION_EXTENSION}")
   target_link_libraries(
     ${_target_name}
     ${_target_name_lib}
@@ -291,13 +272,8 @@ foreach(_pkg_name ${rosidl_generate_interfaces_DEPENDENCY_PACKAGE_NAMES})
   target_link_libraries(${_target_name_lib} ${${_pkg_name}_TARGETS${rosidl_generator_py_suffix}})
 endforeach()
 
-set_lib_properties("")
-if(WIN32)
-  set_lib_properties("_DEBUG")
-  set_lib_properties("_MINSIZEREL")
-  set_lib_properties("_RELEASE")
-  set_lib_properties("_RELWITHDEBINFO")
-endif()
+set_target_properties(${_target_name_lib} PROPERTIES
+  COMPILE_OPTIONS "${_extension_compile_flags}")
 if(NOT rosidl_generate_interfaces_SKIP_INSTALL)
   install(TARGETS ${_target_name_lib}
     EXPORT export_${_target_name_lib}