Revert "Remove sip dependencies for macOS (#268)" (#273)

This reverts commit b5b9e87.

Author: mjcarroll

qt_gui_cpp/CMakeLists.txt

@@ -18,17 +18,8 @@ if(WIN32)
   return()
 endif()
 
-# FindPythonLibs deprecated since 3.12
-# https://cmake.org/cmake/help/latest/module/FindPythonLibs.html
-# Use FindPython to set the cache variables.
-find_package(Python 3 REQUIRED
-  COMPONENTS Interpreter Development
-)
-set(PYTHON_LIBRARY ${Python_LIBRARY_DIRS})
-set(PYTHON_INCLUDE_DIR ${Python_INCLUDE_DIRS})
-
 find_package(pluginlib REQUIRED)
-find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets)
+find_package(Qt5 REQUIRED COMPONENTS Widgets)
 find_package(rcpputils REQUIRED)
 find_package(tinyxml2_vendor REQUIRED)
 find_package(TinyXML2 REQUIRED)
@@ -69,9 +60,7 @@ target_link_libraries(${PROJECT_NAME}
   tinyxml2::tinyxml2)
 
 add_subdirectory(src/qt_gui_cpp_shiboken)
-if (NOT APPLE)
-  add_subdirectory(src/qt_gui_cpp_sip)
-endif()
+add_subdirectory(src/qt_gui_cpp_sip)
 
 message(STATUS "Python binding generators: ${qt_gui_cpp_BINDINGS}")
 if(NOT qt_gui_cpp_BINDINGS)

qt_gui_cpp/src/CMakeLists.txt

@@ -3,9 +3,7 @@ add_subdirectory(qt_gui_cpp)
 set(qt_gui_cpp_BINDINGS "")
 
 add_subdirectory(qt_gui_cpp_shiboken)
-if (NOT APPLE)
-  add_subdirectory(qt_gui_cpp_sip)
-endif()
+add_subdirectory(qt_gui_cpp_sip)
 
 message(STATUS "Python binding generators: ${qt_gui_cpp_BINDINGS}")
 if(NOT qt_gui_cpp_BINDINGS)

qt_gui_cpp/src/qt_gui_cpp_shiboken/CMakeLists.txt

@@ -50,37 +50,17 @@ if(shiboken_helper_FOUND)
     list(APPEND qt_gui_cpp_BINDINGS "shiboken")
     set(qt_gui_cpp_BINDINGS "${qt_gui_cpp_BINDINGS}" PARENT_SCOPE)
 
-    if (APPLE)
-      # The shiboken_generator fails without these includes.
-      # TODO: resolve why these cannot be set using the component variables
-      #       Qt5Core_INCLUDE_DIRS etc.
-      list(APPEND qt_gui_cpp_INCLUDE_PATH "${Qt5_DIR}/../../../include")
-      list(APPEND qt_gui_cpp_INCLUDE_PATH "${Qt5_DIR}/../../../include/QtCore")
-      list(APPEND qt_gui_cpp_INCLUDE_PATH "${Qt5_DIR}/../../../include/QtWidgets")
-    endif()
-
     set(QT_INCLUDE_DIR "${Qt5Widgets_INCLUDE_DIRS}")
     shiboken_generator(libqt_gui_cpp global.h typesystem.xml ${PROJECT_SOURCE_DIR}/src/qt_gui_cpp_shiboken "${qt_gui_cpp_shiboken_SRCS}" "${qt_gui_cpp_HDRS}" "${qt_gui_cpp_INCLUDE_PATH}" "${CMAKE_CURRENT_BINARY_DIR}")
 
     shiboken_include_directories(qt_gui_cpp_shiboken "${qt_gui_cpp_shiboken_QT_COMPONENTS}")
 
     add_library(qt_gui_cpp_shiboken SHARED ${qt_gui_cpp_shiboken_SRCS})
     target_include_directories(qt_gui_cpp_shiboken PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
-    target_link_libraries(qt_gui_cpp_shiboken
-      ${PROJECT_NAME}
-      Qt5::Core
-      Qt5::Gui
-      Qt5::Widgets
-    )
+    target_link_libraries(qt_gui_cpp_shiboken ${PROJECT_NAME})
     ament_target_dependencies(qt_gui_cpp_shiboken pluginlib TinyXML2)
     shiboken_target_link_libraries(qt_gui_cpp_shiboken "${qt_gui_cpp_shiboken_QT_COMPONENTS}")
 
-    if (APPLE)
-      # the brew installed version of cmake (>3.24) supports Python3_SOABI
-      find_package(Python3 COMPONENTS Development)
-      set_target_properties(qt_gui_cpp_shiboken PROPERTIES SUFFIX ".${Python3_SOABI}.so")
-    endif()
-
     install(TARGETS qt_gui_cpp_shiboken
       DESTINATION ${PYTHON_INSTALL_DIR}/${PROJECT_NAME})
   endif()