Try fix linux issues

RoboStack · Dec 30, 2024 · 4caf21c · 4caf21c
1 parent c467355
commit 4caf21c
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/patch/ros-jazzy-qt-gui-cpp.patch b/patch/ros-jazzy-qt-gui-cpp.patch
@@ -1,13 +1,13 @@
 diff --git a/src/qt_gui_cpp_sip/CMakeLists.txt b/src/qt_gui_cpp_sip/CMakeLists.txt
-index 47c24958..11378b3e 100644
+index 47c24958..d5a95d48 100644
 --- a/src/qt_gui_cpp_sip/CMakeLists.txt
 +++ b/src/qt_gui_cpp_sip/CMakeLists.txt
 @@ -28,7 +28,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
 
  # maintain context for different named target
  set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include")
 -set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} lib)
-+set(qt_gui_cpp_sip_LIBRARY_DIRS ${CMAKE_BINARY_DIR} lib)
++set(qt_gui_cpp_sip_LIBRARY_DIRS ${CMAKE_BINARY_DIR})
  set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
 
  ament_get_recursive_properties(deps_include_dirs deps_libraries ${pluginlib_TARGETS})
@@ -16,7 +16,7 @@ index 47c24958..11378b3e 100644
  set(Python3_FIND_UNVERSIONED_NAMES FIRST)
 
 -find_package(Python3 REQUIRED COMPONENTS Development)
-+find_package(Python REQUIRED COMPONENTS Interpreter Development)
++find_package(Python REQUIRED COMPONENTS Development)
 +find_package(OpenGL REQUIRED)
 
  set(_qt_gui_cpp_sip_LIBRARIES
@@ -37,12 +37,11 @@ index 47c24958..11378b3e 100644
    if(TARGET ${_lib_name})
      # Use a nifty cmake generator expression to resolve the target location
      list(APPEND qt_gui_cpp_sip_LIBRARIES $<TARGET_FILE:${_lib_name}>)
-@@ -91,11 +97,20 @@ if(sip_helper_FOUND)
+@@ -91,11 +97,19 @@ if(sip_helper_FOUND)
    )
 
    if(APPLE)
 -    set(LIBQT_GUI_CPP_SIP_SUFFIX .so)
-+    # Okay-ish hack for now
 +    if(${SIP_VERSION} VERSION_GREATER_EQUAL "5.0.0")
 +      set(LIBQT_GUI_CPP_SIP_SUFFIX ".cpython-${Python_VERSION_MAJOR}${Python_VERSION_MINOR}-darwin.so")
 +    else()