diff --git a/CMake/VTKmConfig.cmake.in b/CMake/VTKmConfig.cmake.in
index 2fdb66ebe..b6fb7837c 100755
--- a/CMake/VTKmConfig.cmake.in
+++ b/CMake/VTKmConfig.cmake.in
@@ -65,6 +65,7 @@ set(VTKm_ENABLE_CUDA "@VTKm_ENABLE_CUDA@")
 set(VTKm_ENABLE_TBB "@VTKm_ENABLE_TBB@")
 set(VTKm_ENABLE_OPENGL_INTEROP "@VTKm_ENABLE_OPENGL_INTEROP@")
 set(VTKm_BUILD_RENDERING "@VTKm_BUILD_RENDERING@")
+set(VTKm_ENABLE_OSMESA "@VTKm_ENABLE_OSMESA@")
 
 # Load the library exports, but only if not compiling VTK-m itself
 set_and_check(VTKm_CONFIG_DIR "@PACKAGE_VTKm_INSTALL_CONFIG_DIR@")
diff --git a/CMake/VTKmConfigureComponents.cmake b/CMake/VTKmConfigureComponents.cmake
index 76213a7b3..6c4a081df 100644
--- a/CMake/VTKmConfigureComponents.cmake
+++ b/CMake/VTKmConfigureComponents.cmake
@@ -142,7 +142,7 @@ endmacro(vtkm_configure_component_OpenGL)
 macro(vtkm_configure_component_OSMesa)
   vtkm_configure_component_Base()
 
-  if (UNIX AND NOT APPLE)
+  if (VTKm_ENABLE_OSMESA)
     find_package(MESA ${VTKm_FIND_PACKAGE_QUIETLY})
 
     vtkm_finish_configure_component(OSMesa
@@ -150,8 +150,6 @@ macro(vtkm_configure_component_OSMesa)
       ADD_INCLUDES ${OSMESA_INCLUDE_DIR}
       ADD_LIBRARIES ${OSMESA_LIBRARY}
       )
-  else()
-    vtkm_configure_component_message("OSMesa not supported on this platform.")
   endif()
 endmacro(vtkm_configure_component_OSMesa)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6992eaa5e..7a9775847 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,6 +105,7 @@ option(VTKm_ENABLE_CUDA "Enable Cuda support" OFF)
 option(VTKm_ENABLE_TBB "Enable TBB support" OFF)
 option(VTKm_ENABLE_TESTING "Enable VTKm Testing" ON)
 option(VTKm_ENABLE_BENCHMARKS "Enable VTKm Benchmarking" OFF)
+option(VTKm_ENABLE_OSMESA "Enable creating the OSMesa canvas" OFF)
 
 option(VTKm_BUILD_DOCUMENTATION "Build Doxygen documentation" OFF)
 option(VTKm_BUILD_EXAMPLES "Build examples" OFF)