Skip to content

Commit 4caf21c

Browse files
Try fix linux issues
1 parent c467355 commit 4caf21c

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

patch/ros-jazzy-qt-gui-cpp.patch

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/src/qt_gui_cpp_sip/CMakeLists.txt b/src/qt_gui_cpp_sip/CMakeLists.txt
2-
index 47c24958..11378b3e 100644
2+
index 47c24958..d5a95d48 100644
33
--- a/src/qt_gui_cpp_sip/CMakeLists.txt
44
+++ b/src/qt_gui_cpp_sip/CMakeLists.txt
55
@@ -28,7 +28,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
66

77
# maintain context for different named target
88
set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include")
99
-set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} lib)
10-
+set(qt_gui_cpp_sip_LIBRARY_DIRS ${CMAKE_BINARY_DIR} lib)
10+
+set(qt_gui_cpp_sip_LIBRARY_DIRS ${CMAKE_BINARY_DIR})
1111
set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
1212

1313
ament_get_recursive_properties(deps_include_dirs deps_libraries ${pluginlib_TARGETS})
@@ -16,7 +16,7 @@ index 47c24958..11378b3e 100644
1616
set(Python3_FIND_UNVERSIONED_NAMES FIRST)
1717

1818
-find_package(Python3 REQUIRED COMPONENTS Development)
19-
+find_package(Python REQUIRED COMPONENTS Interpreter Development)
19+
+find_package(Python REQUIRED COMPONENTS Development)
2020
+find_package(OpenGL REQUIRED)
2121

2222
set(_qt_gui_cpp_sip_LIBRARIES
@@ -37,12 +37,11 @@ index 47c24958..11378b3e 100644
3737
if(TARGET ${_lib_name})
3838
# Use a nifty cmake generator expression to resolve the target location
3939
list(APPEND qt_gui_cpp_sip_LIBRARIES $<TARGET_FILE:${_lib_name}>)
40-
@@ -91,11 +97,20 @@ if(sip_helper_FOUND)
40+
@@ -91,11 +97,19 @@ if(sip_helper_FOUND)
4141
)
4242

4343
if(APPLE)
4444
- set(LIBQT_GUI_CPP_SIP_SUFFIX .so)
45-
+ # Okay-ish hack for now
4645
+ if(${SIP_VERSION} VERSION_GREATER_EQUAL "5.0.0")
4746
+ set(LIBQT_GUI_CPP_SIP_SUFFIX ".cpython-${Python_VERSION_MAJOR}${Python_VERSION_MINOR}-darwin.so")
4847
+ else()

0 commit comments

Comments
 (0)