ros-noetic-cmake-modules, FindUUID: Do not put location of macOS SDK …

…in UUID_INCLUDE_DIRS on macOS (#244) * ros-noetic-cmake-modules, FindUUID: Do not put location of macOS SDK in UUID_INCLUDE_DIRS on macOS Use https://github.com/ros/cmake_modules/pull/54/files * Rebuild required packages * Rebuild also on osx-arm64 Co-authored-by: Tobias Fischer <[email protected]>
RoboStack · Apr 2, 2022 · d5343df · d5343df
1 parent c4e1a50
commit d5343df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/patch/ros-noetic-cmake-modules.patch b/patch/ros-noetic-cmake-modules.patch
@@ -2,7 +2,7 @@ diff --git a/cmake/Modules/FindUUID.cmake b/cmake/Modules/FindUUID.cmake
 index 84142f4..e9d1668 100644
 --- a/cmake/Modules/FindUUID.cmake
 +++ b/cmake/Modules/FindUUID.cmake
-@@ -7,12 +7,8 @@
+@@ -7,12 +7,12 @@
  # portability
  # UUID_LIBRARIES - full path to the libraries
  if(WIN32)
@@ -14,6 +14,10 @@ index 84142f4..e9d1668 100644
 -
 +  set(UUID_LIBRARIES Rpcrt4.lib)
 +  set(UUID_FOUND true)
++elseif(APPLE)
++  set(UUID_FOUND true)
++  set(UUID_INCLUDE_DIRS "")
++  set(UUID_LIBRARIES "")
  else()
    find_path(UUID_INCLUDE_DIRS uuid/uuid.h)
    find_library(UUID_LIBRARIES NAMES uuid PATH)
diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -50,6 +50,9 @@ packages_select_by_deps:
   - libmavconn
   - mavros-extras
   - mavlink
+  - cmake-modules
+  - bondcpp
+  - nodelet
 
   # ## Only limited number of packages to reduce maintainer burden
   # - catkin

diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -34,6 +34,9 @@ packages_select_by_deps:
   - roslisp
   - rqt-gui
   - catkin
+  - cmake-modules
+  - bondcpp
+  - nodelet
   # - qt-gui-cpp  # needs manual build
   # - catkin
   # - robot