1
1
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
3
3
--- a/src/qt_gui_cpp_sip/CMakeLists.txt
4
4
+++ b/src/qt_gui_cpp_sip/CMakeLists.txt
5
5
@@ -28,7 +28,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
6
6
7
7
# maintain context for different named target
8
8
set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include")
9
9
- 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})
11
11
set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
12
12
13
13
ament_get_recursive_properties(deps_include_dirs deps_libraries ${pluginlib_TARGETS})
@@ -16,7 +16,7 @@ index 47c24958..11378b3e 100644
16
16
set(Python3_FIND_UNVERSIONED_NAMES FIRST)
17
17
18
18
- find_package(Python3 REQUIRED COMPONENTS Development)
19
- + find_package(Python REQUIRED COMPONENTS Interpreter Development)
19
+ + find_package(Python REQUIRED COMPONENTS Development)
20
20
+ find_package(OpenGL REQUIRED)
21
21
22
22
set(_qt_gui_cpp_sip_LIBRARIES
@@ -37,12 +37,11 @@ index 47c24958..11378b3e 100644
37
37
if(TARGET ${_lib_name})
38
38
# Use a nifty cmake generator expression to resolve the target location
39
39
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)
41
41
)
42
42
43
43
if(APPLE)
44
44
- set(LIBQT_GUI_CPP_SIP_SUFFIX .so)
45
- + # Okay-ish hack for now
46
45
+ if(${SIP_VERSION} VERSION_GREATER_EQUAL "5.0.0")
47
46
+ set(LIBQT_GUI_CPP_SIP_SUFFIX ".cpython-${Python_VERSION_MAJOR}${Python_VERSION_MINOR}-darwin.so")
48
47
+ else()
0 commit comments