reorder the logic.

Signed-off-by: seanyen <[email protected]>

CMakeLists.txt

@@ -66,30 +66,26 @@ macro(build_yaml_cpp)
 endmacro()
 
 find_package(yaml-cpp 0.6 QUIET)
-if(yaml-cpp_FOUND)
-  message(STATUS "Found yaml-cpp ${yaml-cpp_VERSION}")
-  ament_package(
-    CONFIG_EXTRAS "yaml_cpp_vendor-extras.cmake.in"
-  )
-  return()
-endif()
-
-build_yaml_cpp()
+if(NOT yaml-cpp_FOUND)
+  build_yaml_cpp()
 
-if(WIN32)
-  ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.bat)
-  set(ENV_VAR_NAME "PATH")
-  set(ENV_VAR_VALUE "opt\\yaml_cpp_vendor\\bin")
-else()
-  ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.sh)
-  if(APPLE)
-    set(ENV_VAR_NAME "DYLD_LIBRARY_PATH")
+  if(WIN32)
+    ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.bat)
+    set(ENV_VAR_NAME "PATH")
+    set(ENV_VAR_VALUE "opt\\yaml_cpp_vendor\\bin")
   else()
-    set(ENV_VAR_NAME "LD_LIBRARY_PATH")
+    ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.sh)
+    if(APPLE)
+      set(ENV_VAR_NAME "DYLD_LIBRARY_PATH")
+    else()
+      set(ENV_VAR_NAME "LD_LIBRARY_PATH")
+    endif()
+    set(ENV_VAR_VALUE "opt/yaml_cpp_vendor/lib")
   endif()
-  set(ENV_VAR_VALUE "opt/yaml_cpp_vendor/lib")
+  ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.dsv.in)
+else()
+  message(STATUS "Found yaml-cpp ${yaml-cpp_VERSION}")
 endif()
-ament_environment_hooks(env_hook/yaml_cpp_vendor_library_path.dsv.in)
 
 ament_package(
   CONFIG_EXTRAS "yaml_cpp_vendor-extras.cmake.in"