Merged in target_link_options_cmake_check_8 (pull request #686)

Check cmake version before calling target_link_options Approved-by: Addisu Z. Taddese <addisu@openrobotics.org>
gazebosim · Apr 6, 2020 · 1ac0f41 · 1ac0f41
2 parents 15c4356 + 822ed74
commit 1ac0f41
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -7,6 +7,7 @@
 
 1. Fix homebrew build with external urdfdom.
     * [Pull request 677](https://bitbucket.org/osrf/sdformat/pull-requests/677)
+    * [Pull request 686](https://bitbucket.org/osrf/sdformat/pull-requests/686)
 
 ### SDFormat 8.8.0 (2020-03-18)
 

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
@@ -24,6 +24,7 @@ pipelines:
           # Dependency: Ignition packages
           - apt-get -y install
             libignition-cmake2-dev libignition-tools-dev libignition-math6-dev
+            liburdfdom-dev
           # SDFormat
           - mkdir build
           - cd build

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -168,7 +168,9 @@ message (STATUS "URDF_LIBRARIES=${URDF_LIBRARIES}")
 
 if (NOT USE_INTERNAL_URDF)
   target_compile_options(${sdf_target} PRIVATE ${URDF_CFLAGS})
-  target_link_options(${sdf_target} PRIVATE ${URDF_LDFLAGS})
+  if (${CMAKE_VERSION} VERSION_GREATER 3.13)
+    target_link_options(${sdf_target} PRIVATE ${URDF_LDFLAGS})
+  endif()
   target_link_libraries(${sdf_target} PRIVATE ${URDF_LIBRARIES})
 endif()