Merge pull request RobotLocomotion#6423 from fbudin69500/cps_link_flags

Add glib-2.0 link flags to lcm and libbot CMake configuration files
KyleFromKitware · Jun 27, 2017 · 1a5b18c · 1a5b18c
2 parents db47922 + 2b93cec
commit 1a5b18c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -311,8 +311,8 @@ pypi_archive(
 github_archive(
     name = "pycps",
     repository = "mwoehlke/pycps",
-    commit = "abed50cced91a4f8a37f0458564f4b91524d8fef",
-    sha256 = "da30d553cccba59a3332128c1291ece7e9f1db00423800161ee438832b298ed2",
+    commit = "adff2def458928902ad482337330676beeeedb93",
+    sha256 = "61fd6f1810724c50784da97ef666c4b5b9110a8ce57f79b4c5510d6f8bb7c75e",
     build_file = "tools/pycps.BUILD",
 )
 

diff --git a/tools/lcm-create-cps.py b/tools/lcm-create-cps.py
@@ -19,6 +19,7 @@
     },
     "lcm": {
       "Type": "dylib",
+      "Link-Flags": ["-lglib-2.0", "-lpthread"],
       "Location": "@prefix@/lib/liblcm.so",
       "Requires": [ ":lcm-coretypes" ]
     },

diff --git a/tools/libbot.cps b/tools/libbot.cps
@@ -23,6 +23,7 @@
     "bot2-core": {
       "Type": "dylib",
       "Includes": ["@prefix@/include/libbot"],
+      "Link-Flags": ["-lglib-2.0"],
       "Location": "@prefix@/lib/libbot2_core.so",
       "Requires": [
         "bot2-core-lcmtypes:lcmtypes_bot2-core",
@@ -48,6 +49,7 @@
     "bot2-param-client": {
       "Type": "dylib",
       "Includes": ["@prefix@/include/libbot"],
+      "Link-Flags": ["-lglib-2.0", "-lgthread-2.0"],
       "Location": "@prefix@/lib/libbot2_param_client.so",
       "Requires": [
         ":bot2-core",
@@ -74,6 +76,7 @@
     "bot2-frames": {
       "Type": "dylib",
       "Includes": ["@prefix@/include/libbot"],
+      "Link-Flags": ["-lglib-2.0"],
       "Location": "@prefix@/lib/libbot2_frames.so",
       "Requires": [
         ":bot2-core",
@@ -101,6 +104,7 @@
     "bot2-lcmgl-client": {
       "Type": "dylib",
       "Includes": ["@prefix@/include/libbot"],
+      "Link-Flags": ["-lglib-2.0"],
       "Location": "@prefix@/lib/libbot2_lcmgl_client.so",
       "Requires": [
         ":lcmtypes_bot2-lcmgl",