Merge pull request RobotLocomotion#19 from genemerewether/cmake-gtk_g…

…thread_fix Typo in GDKX header; missing gthread-2.0
mwoehlke-kitware · Nov 29, 2016 · e7ff415 · e7ff415
2 parents 807d172 + 1feef38
commit e7ff415
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 # Look for the gdkx.h header to decide whether the local gtk2 install has
 # X11 support or not.
 find_file(GDKX_HEADER gdkx.h PATH_SUFFIXES gtk-2.0/gdk)
-if(GDKXHEADER)
+if(GDKX_HEADER)
   set(bot_vis_default ON)
   message(STATUS "gdkx.h found, system appears to have gtk+X11 support")
 else()

diff --git a/bot2-vis/src/bot_vis/CMakeLists.txt b/bot2-vis/src/bot_vis/CMakeLists.txt
@@ -21,7 +21,7 @@ endif(APPLE)
 
 target_link_libraries(bot2-vis ${REQUIRED_LIBS})
 
-set(REQUIRED_PACKAGES glib-2.0 gtk+-2.0 gdk-pixbuf-2.0 lcm bot2-core libpng gl glu)
+set(REQUIRED_PACKAGES glib-2.0 gtk+-2.0 gdk-pixbuf-2.0 lcm bot2-core libpng gl glu gthread-2.0)
 pods_use_pkg_config_packages(bot2-vis ${REQUIRED_PACKAGES})
 
 # set the library API version.  Increment this every time the public API