Refs #20763. Applying discovery

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Apr 8, 2024 · e1607f5 · e1607f5
1 parent 8a20026
commit e1607f5
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 35 deletions.
diff --git a/fastdds_python/src/swig/CMakeLists.txt b/fastdds_python/src/swig/CMakeLists.txt
@@ -67,7 +67,7 @@ execute_process(COMMAND ${Python3_EXECUTABLE} -c "from distutils import sysconfi
 get_filename_component (_ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE)
 file (RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
 SET (PYTHON_MODULE_PATH
-    ${_REL_PYTHON_MODULE_PATH}
+    ${_REL_PYTHON_MODULE_PATH}/${${PROJECT_NAME}_MODULE}
     )
 
 # Install

diff --git a/fastdds_python/test/api/test_datareader.py b/fastdds_python/test/api/test_datareader.py
@@ -1,11 +1,3 @@
-# until https://bugs.python.org/issue46276 is not fixed we can apply this
-# workaround on windows
-import os
-if os.name == 'nt':
-    import win32api
-    win32api.LoadLibrary('test_complete')
-    win32api.LoadLibrary('test_modules')
-
 import fastdds
 import pytest
 import time

diff --git a/fastdds_python/test/api/test_qos.py b/fastdds_python/test/api/test_qos.py
@@ -1,11 +1,5 @@
 import os
 
-# until https://bugs.python.org/issue46276 is not fixed we can apply this
-# workaround on windows
-if os.name == 'nt':
-    import win32api
-    win32api.LoadLibrary('_fastdds_python.pyd')
-
 import fastdds
 
 import inspect

diff --git a/fastdds_python/test/api/test_waitset.py b/fastdds_python/test/api/test_waitset.py
@@ -1,11 +1,3 @@
-# until https://bugs.python.org/issue46276 is not fixed we can apply this
-# workaround on windows
-import os
-if os.name == 'nt':
-    import win32api
-    win32api.LoadLibrary('test_complete')
-    win32api.LoadLibrary('test_modules')
-
 import fastdds
 import pytest
 

diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt
@@ -105,7 +105,7 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig
 get_filename_component (_ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE)
 file (RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
 SET (PYTHON_MODULE_PATH
-    ${_REL_PYTHON_MODULE_PATH}
+    ${_REL_PYTHON_MODULE_PATH}/${PROJECT_NAME}
     )
 
 # Install
@@ -212,7 +212,7 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig
 get_filename_component (_ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE)
 file (RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
 SET (PYTHON_MODULE_PATH
-    ${_REL_PYTHON_MODULE_PATH}
+    ${_REL_PYTHON_MODULE_PATH}/${PROJECT_NAME}
     )
 
 # Install
@@ -320,7 +320,7 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig
 get_filename_component (_ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE)
 file (RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
 SET (PYTHON_MODULE_PATH
-    ${_REL_PYTHON_MODULE_PATH}
+    ${_REL_PYTHON_MODULE_PATH}/${PROJECT_NAME}
     )
 
 # Install
@@ -332,4 +332,3 @@ install(TARGETS ${PROJECT_NAME}
 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}/)
-
diff --git a/fastdds_python_examples/HelloWorldExample/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/CMakeLists.txt
@@ -105,7 +105,7 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig
 get_filename_component (_ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE)
 file (RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
 SET (PYTHON_MODULE_PATH
-    ${_REL_PYTHON_MODULE_PATH}
+    ${_REL_PYTHON_MODULE_PATH}/${PROJECT_NAME}
     )
 
 # Install
@@ -117,4 +117,3 @@ install(TARGETS ${PROJECT_NAME}
 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}/)
-
diff --git a/fastdds_python_examples/HelloWorldExample/HelloWorldExample.py b/fastdds_python_examples/HelloWorldExample/HelloWorldExample.py
@@ -19,12 +19,6 @@
 import argparse
 from threading import Condition
 
-# until https://bugs.python.org/issue46276 is not fixed we can apply this
-# workaround on windows
-if os.name == 'nt':
-    import win32api
-    win32api.LoadLibrary('HelloWorld')
-
 import fastdds
 import HelloWorld