              ENDFOREACH(target)
          ENDIF(NOT WIN32)
          IF(APPLE)
+Index: visit/databases/CMakeLists.txt
+===================================================================
+--- visit/databases/CMakeLists.txt	(revision 21259)
++++ visit/databases/CMakeLists.txt	(working copy)
+@@ -393,6 +393,11 @@
+     ENDIF(VISIT_BUILD_MINIMAL_PLUGINS)
+ ENDIF(VISIT_BUILD_ALL_PLUGINS)
+ 
++# Everything here needs MESA on non-Windows
++if (LINUX)
++  link_directories(${MESA_LIBRARY_DIR})
++endif ()
++
+ # Add the plugin directories
+ FOREACH(db ${BUILD_PLUGINS})
+     ADD_SUBDIRECTORY(${db})
+Index: visit/databases/SimV2/CMakeLists.txt
+===================================================================
+--- visit/databases/SimV2/CMakeLists.txt	(revision 21259)
++++ visit/databases/SimV2/CMakeLists.txt	(working copy)
+@@ -55,6 +55,9 @@
+ 
+ 
+ LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${ICET_LIBRARY_DIR} )
++if (LINUX)
++  link_directories(${MESA_LIBRARY_DIR})
++endif ()
+ 
+ ADD_LIBRARY(ISimV2Database ${LIBI_SOURCES})
+ TARGET_LINK_LIBRARIES(ISimV2Database visitcommon)
 Index: visit/operators/CMakeLists.txt
 ===================================================================
---- visit/operators/CMakeLists.txt	(revision 21257)
+--- visit/operators/CMakeLists.txt	(revision 21259)
 +++ visit/operators/CMakeLists.txt	(working copy)
 @@ -171,6 +171,11 @@
    LIST(APPEND BUILD_PLUGINS ModelBasedClustering)

 # Add the plugin directories
 FOREACH(plot ${BUILD_PLUGINS})
     ADD_SUBDIRECTORY(${plot})

 # Add the plugin directories
 FOREACH(operator ${BUILD_PLUGINS})
     ADD_SUBDIRECTORY(${operator})
Index: visit/plots/CMakeLists.txt
===================================================================
--- visit/plots/CMakeLists.txt	(revision 21259)
+++ visit/plots/CMakeLists.txt	(working copy)
@@ -89,6 +89,11 @@
     ENDIF(VISIT_BUILD_MINIMAL_PLUGINS)
