Merge pull request #1274 from wkentaro/find-boost-lib-once

[jsk_topic_tools] Find Boost_LIBRARIES once nodelt.cmake
jsk-ros-pkg · Dec 7, 2015 · 1343565 · 1343565
2 parents cbb0de2 + b647863
commit 1343565
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/jsk_topic_tools/cmake/nodelet.cmake b/jsk_topic_tools/cmake/nodelet.cmake
@@ -24,7 +24,9 @@ macro(jsk_nodelet _nodelet_cpp _nodelet_class
     rosbuild_add_executable(${_single_nodelet_exec_name} build/${_single_nodelet_exec_name}.cpp)
   else(${USE_ROSBUILD})
     add_executable(${_single_nodelet_exec_name} ${_single_nodelet_exec_name}.cpp)
-    find_package(Boost REQUIRED COMPONENTS program_options)
+    if(NOT Boost_PROGRAM_OPTIONS_LIBRARY)
+      find_package(Boost REQUIRED COMPONENTS program_options)
+    endif()
     target_link_libraries(${_single_nodelet_exec_name} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
   endif(${USE_ROSBUILD})
   if (${ARGC} GREATER 4)