Merge pull request RobotLocomotion#7650 from jamiesnape/boost-drake-cps

Add Boost::boost to drake.cps and SDFormat.cps
Kun-Son · Dec 20, 2017 · bc84e73 · bc84e73
2 parents 3b42332 + b99ab55
commit bc84e73
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/tools/install/libdrake/drake.cps b/tools/install/libdrake/drake.cps
@@ -7,6 +7,10 @@
   "Name": "drake",
   "Website": "http://drake.mit.edu/",
   "Requires": {
+    "Boost": {
+      "Version": "1.58",
+      "X-CMake-Find-Args": ["MODULE"]
+    },
     "bot2-core-lcmtypes": {
       "Hints": ["@prefix@/lib/cmake/bot2-core-lcmtypes"],
       "X-CMake-Find-Args": ["CONFIG"]
@@ -103,6 +107,7 @@
       ],
       "Requires": [
         ":drake-lcmtypes-cpp",
+        "Boost:boost",
         "bot2-core-lcmtypes:lcmtypes_bot2-core-cpp",
         "Bullet:BulletCollision",
         "Eigen3:Eigen",

diff --git a/tools/workspace/sdformat/sdformat-create-cps.py b/tools/workspace/sdformat/sdformat-create-cps.py
@@ -14,24 +14,30 @@
   "License": "Apache-2.0",
   "Version": "%(MAJOR_VERSION)s.%(MINOR_VERSION)s.%(PATCH_VERSION)s",
   "Requires": {
+    "Boost": {
+      "Version": "1.58",
+      "X-CMake-Find-Args": ["MODULE"]
+    },
     "ignition-math3": {
       "Version": "%(ignition-math3_VERSION)s",
       "Hints": ["@prefix@/lib/cmake/ignition-math3"],
-      "X-CMake-Find-Args": [ "CONFIG" ]
+      "X-CMake-Find-Args": ["CONFIG"]
     }
   },
   "Default-Components": [ ":sdformat" ],
   "Components": {
     "sdformat": {
       "Type": "dylib",
       "Location": "@prefix@/lib/libsdformat.so",
-      "Includes": [ "@prefix@/include" ],
-      "Link-Flags": [ "-ltinyxml" ],
-      "Requires": [ "ignition-math3:ignition-math3" ]
+      "Includes": ["@prefix@/include"],
+      "Link-Flags": ["-ltinyxml"],
+      "Requires": [
+        "Boost:boost",
+        "ignition-math3:ignition-math3"
+      ]
     }
   }
 }
 """ % defs
 
-
 print(content[1:])