From 4a8c2dc7c0300ce27c839903245d13828b3a2b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez?= Date: Fri, 18 Jul 2025 12:12:12 +0200 Subject: [PATCH 1/9] Refs #23483. First approach MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González --- fastdds_python/CMakeLists.txt | 2 +- fastdds_python/colcon.pkg | 2 +- fastdds_python/src/swig/CMakeLists.txt | 7 ++++++- fastdds_python/src/swig/fastdds.i | 8 ++++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index 44dad5f5..fbec9e41 100644 --- a/fastdds_python/CMakeLists.txt +++ b/fastdds_python/CMakeLists.txt @@ -53,7 +53,7 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) find_package(fastcdr REQUIRED) find_package(fastdds 3 REQUIRED) diff --git a/fastdds_python/colcon.pkg b/fastdds_python/colcon.pkg index 2eae5c49..d91629b7 100644 --- a/fastdds_python/colcon.pkg +++ b/fastdds_python/colcon.pkg @@ -1,5 +1,5 @@ { "name": "fastdds_python", "type": "cmake", - "build-dependencies": ["fastdds"] + "dependencies": ["fastdds"] } diff --git a/fastdds_python/src/swig/CMakeLists.txt b/fastdds_python/src/swig/CMakeLists.txt index 0623526f..5a424aed 100644 --- a/fastdds_python/src/swig/CMakeLists.txt +++ b/fastdds_python/src/swig/CMakeLists.txt @@ -59,10 +59,15 @@ endif() if(MSVC OR MSVC_IDE) target_compile_options(${PROJECT_NAME} PRIVATE /bigobj) + target_compile_definitions(${PROJECT_NAME} + PRIVATE + NOMINMAX + Py_LIMITED_API=0x03040000 + ) endif() target_link_libraries(${PROJECT_NAME} - Python3::Module + Python3::SABIModule fastcdr fastdds ) diff --git a/fastdds_python/src/swig/fastdds.i b/fastdds_python/src/swig/fastdds.i index 662237f7..2c921f86 100644 --- a/fastdds_python/src/swig/fastdds.i +++ b/fastdds_python/src/swig/fastdds.i @@ -24,14 +24,18 @@ std::string err_msg("In method '$symname': "); PyObject* exc_str = PyObject_GetAttrString(exc, "__name__"); - err_msg += PyUnicode_AsUTF8(exc_str); + PyObject* unicode = PyUnicode_AsUTF8String (exc_str); + err_msg += PyBytes_AsString(unicode); + Py_XDECREF(unicode); Py_XDECREF(exc_str); if (val != NULL) { PyObject* val_str = PyObject_Str(val); + PyObject* unicode2 = PyUnicode_AsUTF8String (val_str); err_msg += ": "; - err_msg += PyUnicode_AsUTF8(val_str); + err_msg += PyBytes_AsString(unicode); + Py_XDECREF(unicode2); Py_XDECREF(val_str); } From 7ab9ccdd2bd66912eeed5e5c88ce90cbc8e80a49 Mon Sep 17 00:00:00 2001 From: danipiza Date: Mon, 21 Jul 2025 11:16:29 +0200 Subject: [PATCH 2/9] [#23483] Added cmake-arg 'USE_PYTHON_STABLE_ABI' Signed-off-by: danipiza --- fastdds_python/CMakeLists.txt | 6 +++++- fastdds_python/src/swig/CMakeLists.txt | 21 +++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index fbec9e41..990b1df6 100644 --- a/fastdds_python/CMakeLists.txt +++ b/fastdds_python/CMakeLists.txt @@ -53,7 +53,11 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) +if(USE_PYTHON_STABLE_ABI) + find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) +else() + find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +endif() find_package(fastcdr REQUIRED) find_package(fastdds 3 REQUIRED) diff --git a/fastdds_python/src/swig/CMakeLists.txt b/fastdds_python/src/swig/CMakeLists.txt index 5a424aed..9c7e3dea 100644 --- a/fastdds_python/src/swig/CMakeLists.txt +++ b/fastdds_python/src/swig/CMakeLists.txt @@ -59,15 +59,24 @@ endif() if(MSVC OR MSVC_IDE) target_compile_options(${PROJECT_NAME} PRIVATE /bigobj) - target_compile_definitions(${PROJECT_NAME} - PRIVATE - NOMINMAX - Py_LIMITED_API=0x03040000 - ) + + if(USE_PYTHON_STABLE_ABI) + target_compile_definitions(${PROJECT_NAME} + PRIVATE + NOMINMAX + Py_LIMITED_API=0x03040000 + ) + endif() + +endif() + +if(USE_PYTHON_STABLE_ABI) + target_link_libraries(${PROJECT_NAME} Python3::SABIModule) +else() + target_link_libraries(${PROJECT_NAME} Python3::Module) endif() target_link_libraries(${PROJECT_NAME} - Python3::SABIModule fastcdr fastdds ) From 4b46d8839fbe5181b4c4c5d676092bc11fd00d4a Mon Sep 17 00:00:00 2001 From: danipiza Date: Mon, 21 Jul 2025 12:32:56 +0200 Subject: [PATCH 3/9] [#23483] Added cmake-arg in the tests Signed-off-by: danipiza --- fastdds_python/test/types/CMakeLists.txt | 7 ++++++- .../HelloWorldExample/generated_code/CMakeLists.txt | 7 ++++++- .../RPCExample/generated_code/CMakeLists.txt | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt index 12ad5204..e38d8fd3 100644 --- a/fastdds_python/test/types/CMakeLists.txt +++ b/fastdds_python/test/types/CMakeLists.txt @@ -78,7 +78,12 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +if(USE_PYTHON_STABLE_ABI) + find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) +else() + find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +endif() + set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) diff --git a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt index 1e857efb..564b1f95 100644 --- a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt @@ -78,7 +78,12 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +if(USE_PYTHON_STABLE_ABI) + find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) +else() + find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +endif() + set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) diff --git a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt index 79382f18..80803c92 100644 --- a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt @@ -73,7 +73,12 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +if(USE_PYTHON_STABLE_ABI) + find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) +else() + find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +endif() + set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) From 4ad24b8910b7d5fd365c376d9db0300aa7179c24 Mon Sep 17 00:00:00 2001 From: danipiza Date: Wed, 23 Jul 2025 10:08:48 +0200 Subject: [PATCH 4/9] [#23483] Added STABLE_ABI configuration to python_examples + modified calculator.i Signed-off-by: danipiza --- .../generated_code/CMakeLists.txt | 17 ++++++++++++++++- .../RPCExample/generated_code/CMakeLists.txt | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt index 564b1f95..6f313f5b 100644 --- a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt @@ -114,8 +114,23 @@ if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 8) set_property(TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_COMPILE_DEFINITIONS SWIGWORDSIZE64) endif() +if(MSVC OR MSVC_IDE) + if(USE_PYTHON_STABLE_ABI) + target_compile_definitions(${${PROJECT_NAME}_MODULE} + PRIVATE + NOMINMAX + Py_LIMITED_API=0x03040000 + ) + endif() +endif() + +if(USE_PYTHON_STABLE_ABI) + target_link_libraries(${${PROJECT_NAME}_MODULE} Python3::SABIModule) +else() + target_link_libraries(${${PROJECT_NAME}_MODULE} Python3::Module) +endif() + target_link_libraries(${${PROJECT_NAME}_MODULE} - Python3::Module fastdds ${PROJECT_NAME} ) diff --git a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt index 80803c92..ce95ec8c 100644 --- a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt @@ -109,8 +109,23 @@ if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 8) set_property(TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_COMPILE_DEFINITIONS SWIGWORDSIZE64) endif() +if(MSVC OR MSVC_IDE) + if(USE_PYTHON_STABLE_ABI) + target_compile_definitions(${${PROJECT_NAME}_MODULE} + PRIVATE + NOMINMAX + Py_LIMITED_API=0x03040000 + ) + endif() +endif() + +if(USE_PYTHON_STABLE_ABI) + target_link_libraries(${${PROJECT_NAME}_MODULE} Python3::SABIModule) +else() + target_link_libraries(${${PROJECT_NAME}_MODULE} Python3::Module) +endif() + target_link_libraries(${${PROJECT_NAME}_MODULE} - Python3::Module fastdds ${PROJECT_NAME} ) From 56c5df6f4d11b7ee7634b294a5a837066587e865 Mon Sep 17 00:00:00 2001 From: danipiza Date: Thu, 31 Jul 2025 14:44:14 +0200 Subject: [PATCH 5/9] [#23483] Added 'Development.SABIModule' to all tests Signed-off-by: danipiza --- fastdds_python/test/types/CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt index e38d8fd3..9af1b546 100644 --- a/fastdds_python/test/types/CMakeLists.txt +++ b/fastdds_python/test/types/CMakeLists.txt @@ -195,7 +195,12 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +if(USE_PYTHON_STABLE_ABI) + find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) +else() + find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +endif() + set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) @@ -308,7 +313,13 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -find_package(Python3 COMPONENTS Interpreter Development REQUIRED) + +if(USE_PYTHON_STABLE_ABI) + find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) +else() + find_package(Python3 COMPONENTS Interpreter Development REQUIRED) +endif() + set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) From e2e4fbec3d57a3cb221aa1eb81741716344c9484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez?= Date: Mon, 29 Sep 2025 07:38:56 +0200 Subject: [PATCH 6/9] Refs #23483. Improve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González --- fastdds_python/CMakeLists.txt | 2 ++ fastdds_python/src/swig/CMakeLists.txt | 7 +------ fastdds_python/test/types/CMakeLists.txt | 19 +++---------------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index 990b1df6..909c7d2f 100644 --- a/fastdds_python/CMakeLists.txt +++ b/fastdds_python/CMakeLists.txt @@ -53,6 +53,8 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") +option(USE_PYTHON_STABLE_ABI "Generate Fast DDS python against Python Stable ABI" OFF) + if(USE_PYTHON_STABLE_ABI) find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) else() diff --git a/fastdds_python/src/swig/CMakeLists.txt b/fastdds_python/src/swig/CMakeLists.txt index 9c7e3dea..fd7b91bb 100644 --- a/fastdds_python/src/swig/CMakeLists.txt +++ b/fastdds_python/src/swig/CMakeLists.txt @@ -70,13 +70,8 @@ if(MSVC OR MSVC_IDE) endif() -if(USE_PYTHON_STABLE_ABI) - target_link_libraries(${PROJECT_NAME} Python3::SABIModule) -else() - target_link_libraries(${PROJECT_NAME} Python3::Module) -endif() - target_link_libraries(${PROJECT_NAME} + $, Python3::SABIModule, Python3::Module> fastcdr fastdds ) diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt index 9af1b546..9bd9d8ae 100644 --- a/fastdds_python/test/types/CMakeLists.txt +++ b/fastdds_python/test/types/CMakeLists.txt @@ -78,11 +78,7 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -if(USE_PYTHON_STABLE_ABI) - find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) -else() - find_package(Python3 COMPONENTS Interpreter Development REQUIRED) -endif() +find_package(Python3 COMPONENTS Interpreter Development REQUIRED) set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) @@ -195,11 +191,7 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -if(USE_PYTHON_STABLE_ABI) - find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) -else() - find_package(Python3 COMPONENTS Interpreter Development REQUIRED) -endif() +find_package(Python3 COMPONENTS Interpreter Development REQUIRED) set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) @@ -313,12 +305,7 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") - -if(USE_PYTHON_STABLE_ABI) - find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) -else() - find_package(Python3 COMPONENTS Interpreter Development REQUIRED) -endif() +find_package(Python3 COMPONENTS Interpreter Development REQUIRED) set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) From 5f3776c180b70ca04a5d34232f507145d14675c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez?= Date: Mon, 29 Sep 2025 08:08:35 +0200 Subject: [PATCH 7/9] Refs #23483. Remove from generated code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González --- .../generated_code/CMakeLists.txt | 23 ++----------------- .../RPCExample/generated_code/CMakeLists.txt | 23 ++----------------- 2 files changed, 4 insertions(+), 42 deletions(-) diff --git a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt index 6f313f5b..605b4d2d 100644 --- a/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/HelloWorldExample/generated_code/CMakeLists.txt @@ -78,11 +78,7 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -if(USE_PYTHON_STABLE_ABI) - find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) -else() - find_package(Python3 COMPONENTS Interpreter Development REQUIRED) -endif() +find_package(Python3 COMPONENTS Interpreter Development REQUIRED) set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) @@ -114,23 +110,8 @@ if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 8) set_property(TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_COMPILE_DEFINITIONS SWIGWORDSIZE64) endif() -if(MSVC OR MSVC_IDE) - if(USE_PYTHON_STABLE_ABI) - target_compile_definitions(${${PROJECT_NAME}_MODULE} - PRIVATE - NOMINMAX - Py_LIMITED_API=0x03040000 - ) - endif() -endif() - -if(USE_PYTHON_STABLE_ABI) - target_link_libraries(${${PROJECT_NAME}_MODULE} Python3::SABIModule) -else() - target_link_libraries(${${PROJECT_NAME}_MODULE} Python3::Module) -endif() - target_link_libraries(${${PROJECT_NAME}_MODULE} + Python3::Module fastdds ${PROJECT_NAME} ) diff --git a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt index ce95ec8c..98a78d73 100644 --- a/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt +++ b/fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt @@ -73,11 +73,7 @@ endif() include(${SWIG_USE_FILE}) set(CMAKE_SWIG_FLAGS "") -if(USE_PYTHON_STABLE_ABI) - find_package(Python3 COMPONENTS Interpreter Development.SABIModule REQUIRED) -else() - find_package(Python3 COMPONENTS Interpreter Development REQUIRED) -endif() +find_package(Python3 COMPONENTS Interpreter Development REQUIRED) set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) @@ -109,23 +105,8 @@ if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 8) set_property(TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_COMPILE_DEFINITIONS SWIGWORDSIZE64) endif() -if(MSVC OR MSVC_IDE) - if(USE_PYTHON_STABLE_ABI) - target_compile_definitions(${${PROJECT_NAME}_MODULE} - PRIVATE - NOMINMAX - Py_LIMITED_API=0x03040000 - ) - endif() -endif() - -if(USE_PYTHON_STABLE_ABI) - target_link_libraries(${${PROJECT_NAME}_MODULE} Python3::SABIModule) -else() - target_link_libraries(${${PROJECT_NAME}_MODULE} Python3::Module) -endif() - target_link_libraries(${${PROJECT_NAME}_MODULE} + Python3::Module fastdds ${PROJECT_NAME} ) From 9f8b45a1c9b100fafff26d4a15928292bb7fd994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez?= Date: Mon, 29 Sep 2025 09:17:18 +0200 Subject: [PATCH 8/9] Testing cmake 3.24 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González --- .github/workflows/reusable-ubuntu-ci.yml | 4 ++-- .github/workflows/reusable-windows-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index 256e61dd..bd5dfc16 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -88,7 +88,7 @@ jobs: - name: Get minimum supported version of CMake uses: eProsima/eProsima-CI/external/get-cmake@v0 with: - cmakeVersion: '3.22.6' + cmakeVersion: '3.24.4' - name: Install apt dependencies uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0 @@ -188,7 +188,7 @@ jobs: - name: Get minimum supported version of CMake uses: eProsima/eProsima-CI/external/get-cmake@v0 with: - cmakeVersion: '3.22.6' + cmakeVersion: '3.24.4' - name: Install apt packages uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0 diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index 8561f041..e8503740 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -91,7 +91,7 @@ jobs: - name: Get minimum supported version of CMake uses: eProsima/eProsima-CI/external/get-cmake@v0 with: - cmakeVersion: '3.22.6' + cmakeVersion: '3.24.4' - name: Install OpenSSL uses: eProsima/eprosima-CI/windows/install_openssl@v0 @@ -210,7 +210,7 @@ jobs: - name: Get minimum supported version of CMake uses: eProsima/eProsima-CI/external/get-cmake@v0 with: - cmakeVersion: '3.22.6' + cmakeVersion: '3.24.4' - name: Install OpenSSL uses: eProsima/eprosima-CI/windows/install_openssl@v0 From f9f6d608a57b4579aa19ee3b236c2b46a42424f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Mon, 29 Sep 2025 10:17:40 +0200 Subject: [PATCH 9/9] Refs #23483. Increase cmake_minimum_required MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- fastdds_python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index 909c7d2f..6f589d4f 100644 --- a/fastdds_python/CMakeLists.txt +++ b/fastdds_python/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.24) # SWIG: use standard target name. if(POLICY CMP0078)