Merged in fix_examples_osx (pull request #1155)

Fix build for two example plugins on osx
gazebosim · Jul 29, 2014 · 2f64462 · 2f64462
2 parents 8ca5af8 + f9847b0
commit 2f64462
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 20 deletions.
diff --git a/examples/plugins/animate_joints/CMakeLists.txt b/examples/plugins/animate_joints/CMakeLists.txt
@@ -1,11 +1,12 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
-include (FindPkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_check_modules(GAZEBO gazebo)
-endif()
+find_package(Boost REQUIRED system)
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+find_package(gazebo REQUIRED)
 include_directories(${GAZEBO_INCLUDE_DIRS})
 link_directories(${GAZEBO_LIBRARY_DIRS})
 
 add_library(animate_joints SHARED animate_joints.cc)
-target_link_libraries(animate_joints ${GAZEBO_LIBRARIES})
+target_link_libraries(animate_joints ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES})
diff --git a/examples/plugins/animate_pose/CMakeLists.txt b/examples/plugins/animate_pose/CMakeLists.txt
@@ -1,11 +1,12 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
-include (FindPkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_check_modules(GAZEBO gazebo)
-endif()
+find_package(Boost REQUIRED system)
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+find_package(gazebo REQUIRED)
 include_directories(${GAZEBO_INCLUDE_DIRS})
 link_directories(${GAZEBO_LIBRARY_DIRS})
 
 add_library(animate_pose SHARED animate_pose.cc)
-target_link_libraries(animate_pose ${GAZEBO_libraries})
+target_link_libraries(animate_pose ${GAZEBO_LIBRARIES} ${Boost_LIBRARY_DIRS})
diff --git a/examples/plugins/parameters/CMakeLists.txt b/examples/plugins/parameters/CMakeLists.txt
@@ -1,11 +1,12 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
-include (FindPkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_check_modules(GAZEBO gazebo)
-endif()
+find_package(Boost REQUIRED system)
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+find_package(gazebo REQUIRED)
 include_directories(${GAZEBO_INCLUDE_DIRS})
 link_directories(${GAZEBO_LIBRARY_DIRS})
 
 add_library(parameters SHARED parameters.cc)
-target_link_libraries(parameters ${GAZEBO_libraries})
+target_link_libraries(parameters ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES})
diff --git a/examples/plugins/projector/CMakeLists.txt b/examples/plugins/projector/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
-include (FindPkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_check_modules(GAZEBO gazebo)
-endif()
+find_package(Boost REQUIRED system)
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
 
+find_package(gazebo REQUIRED)
 include_directories(${GAZEBO_INCLUDE_DIRS})
 link_directories(${GAZEBO_LIBRARY_DIRS})
 
 add_library(projector_plugin SHARED projector.cc)
-target_link_libraries(projector_plugin ${GAZEBO_libraries})
+target_link_libraries(projector_plugin ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES})
diff --git a/examples/plugins/system_gui_plugin/CMakeLists.txt b/examples/plugins/system_gui_plugin/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
+find_package(Boost REQUIRED)
+include_directories(${Boost_INCLUDE_DIRS})
+
 include (FindPkgConfig)
 if (PKG_CONFIG_FOUND)
   pkg_check_modules(GAZEBO gazebo)