mojave compatibility (#414) (#433)

Signed-off-by: Karsten Knese <karsten@openrobotics.org>
ros2 · Jul 31, 2019 · 8304a51 · 8304a51
1 parent 4b3fcb4
commit 8304a51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/rviz_default_plugins/CMakeLists.txt b/rviz_default_plugins/CMakeLists.txt
@@ -55,7 +55,6 @@ find_package(ament_cmake REQUIRED)
 find_package(rviz_common REQUIRED)
 find_package(rviz_rendering REQUIRED)
 find_package(rviz_ogre_vendor REQUIRED)
-find_package(rviz_visual_testing_framework REQUIRED)
 
 find_package(Qt5 REQUIRED COMPONENTS Widgets Test)
 
@@ -295,6 +294,7 @@ if(BUILD_TESTING)
   find_package(ament_cmake_gtest REQUIRED)
   find_package(ament_cmake_gmock REQUIRED)
   find_package(ament_index_cpp REQUIRED)
+  find_package(rviz_visual_testing_framework REQUIRED)
   find_package(sensor_msgs REQUIRED)
   find_package(visualization_msgs REQUIRED)
 

diff --git a/rviz_ogre_vendor/CMakeLists.txt b/rviz_ogre_vendor/CMakeLists.txt
@@ -174,6 +174,8 @@ macro(build_ogre)
       -DOGRE_RESOURCEMANAGER_STRICT:STRING=2
       -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/ogre_install
       -DOGRE_BUILD_LIBS_AS_FRAMEWORKS:BOOL=OFF
+      -DOGRE_BUILD_COMPONENT_PYTHON:BOOL=FALSE
+      -DOGRE_BUILD_COMPONENT_JAVA:BOOL=FALSE
       ${extra_cmake_args}
       -Wno-dev
     PATCH_COMMAND