Refs #20763. Regenerate code with fastddsgen

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · May 22, 2024 · 9052c29 · 9052c29
1 parent 3d16b98
commit 9052c29
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 23 deletions.
diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.22)
+cmake_minimum_required(VERSION 3.20)
 
 # SWIG: use standard target name.
 if(POLICY CMP0078)
@@ -73,7 +73,6 @@ SET_SOURCE_FILES_PROPERTIES(
     USE_TARGET_INCLUDE_DIRECTORIES TRUE
     )
 
-
 SWIG_ADD_LIBRARY(${${PROJECT_NAME}_MODULE}
     TYPE SHARED
     LANGUAGE python
@@ -90,7 +89,6 @@ target_link_libraries(${${PROJECT_NAME}_MODULE}
     ${PROJECT_NAME}
     )
 
-
 # Find the installation path
 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}'))"
     OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
@@ -191,7 +189,6 @@ target_link_libraries(${${PROJECT_NAME}_MODULE}
     ${PROJECT_NAME}
     )
 
-
 # Find the installation path
 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}'))"
     OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
@@ -277,8 +274,6 @@ SET_SOURCE_FILES_PROPERTIES(
     USE_TARGET_INCLUDE_DIRECTORIES TRUE
     )
 
-set_property(SOURCE ${PROJECT_NAME}.i PROPERTY OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/")
-
 SWIG_ADD_LIBRARY(${${PROJECT_NAME}_MODULE}
     TYPE SHARED
     LANGUAGE python
@@ -295,11 +290,6 @@ target_link_libraries(${${PROJECT_NAME}_MODULE}
     ${PROJECT_NAME}
     )
 
-set_target_properties(${${PROJECT_NAME}_MODULE}
-    PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
-    )
-
-
 # Find the installation path
 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}'))"
     OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
@@ -318,6 +308,7 @@ install(TARGETS ${PROJECT_NAME}
     LIBRARY DESTINATION lib/
     ARCHIVE DESTINATION lib/
     )
-install(TARGETS ${${PROJECT_NAME}_MODULE} DESTINATION ${PYTHON_MODULE_PATH}/)
+install(TARGETS ${${PROJECT_NAME}_MODULE} DESTINATION ${PYTHON_MODULE_PATH})
 get_property(support_files TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_SUPPORT_FILES)
-install(FILES ${support_files} DESTINATION ${PYTHON_MODULE_PATH}/ RENAME __init__.py)
+install(FILES ${support_files} DESTINATION ${PYTHON_MODULE_PATH} RENAME __init__.py)
+
diff --git a/fastdds_python/test/types/test_complete.i b/fastdds_python/test/types/test_complete.i
@@ -2851,3 +2851,4 @@ namespace swig {
 
 // Include the corresponding TopicDataType
 %include "test_completePubSubTypes.i"
+
diff --git a/fastdds_python/test/types/test_included_modules.i b/fastdds_python/test/types/test_included_modules.i
@@ -260,3 +260,4 @@ namespace swig {
 
 // Include the corresponding TopicDataType
 %include "test_included_modulesPubSubTypes.i"
+
diff --git a/fastdds_python/test/types/test_modules.i b/fastdds_python/test/types/test_modules.i
@@ -2839,3 +2839,4 @@ namespace swig {
 
 // Include the corresponding TopicDataType
 %include "test_modulesPubSubTypes.i"
+
diff --git a/fastdds_python_examples/HelloWorldExample/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.22)
+cmake_minimum_required(VERSION 3.20)
 
 # SWIG: use standard target name.
 if(POLICY CMP0078)
@@ -73,8 +73,6 @@ SET_SOURCE_FILES_PROPERTIES(
     USE_TARGET_INCLUDE_DIRECTORIES TRUE
     )
 
-set_property(SOURCE ${PROJECT_NAME}.i PROPERTY OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/")
-
 SWIG_ADD_LIBRARY(${${PROJECT_NAME}_MODULE}
     TYPE SHARED
     LANGUAGE python
@@ -91,11 +89,6 @@ target_link_libraries(${${PROJECT_NAME}_MODULE}
     ${PROJECT_NAME}
     )
 
-set_target_properties(${${PROJECT_NAME}_MODULE}
-    PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
-    )
-
-
 # Find the installation path
 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}'))"
     OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
@@ -114,6 +107,7 @@ install(TARGETS ${PROJECT_NAME}
     LIBRARY DESTINATION lib/
     ARCHIVE DESTINATION lib/
     )
-install(TARGETS ${${PROJECT_NAME}_MODULE} DESTINATION ${PYTHON_MODULE_PATH}/)
+install(TARGETS ${${PROJECT_NAME}_MODULE} DESTINATION ${PYTHON_MODULE_PATH})
 get_property(support_files TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_SUPPORT_FILES)
-install(FILES ${support_files} DESTINATION ${PYTHON_MODULE_PATH}/ RENAME __init__.py)
+install(FILES ${support_files} DESTINATION ${PYTHON_MODULE_PATH} RENAME __init__.py)
+
diff --git a/fastdds_python_examples/HelloWorldExample/HelloWorld.i b/fastdds_python_examples/HelloWorldExample/HelloWorld.i
@@ -126,3 +126,4 @@ namespace swig {
 
 // Include the corresponding TopicDataType
 %include "HelloWorldPubSubTypes.i"
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2851,3 +2851,4 @@ namespace swig {

		// Include the corresponding TopicDataType
		%include "test_completePubSubTypes.i"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -260,3 +260,4 @@ namespace swig {

		// Include the corresponding TopicDataType
		%include "test_included_modulesPubSubTypes.i"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2839,3 +2839,4 @@ namespace swig {

		// Include the corresponding TopicDataType
		%include "test_modulesPubSubTypes.i"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -126,3 +126,4 @@ namespace swig {

		// Include the corresponding TopicDataType
		%include "HelloWorldPubSubTypes.i"