fix mac & windows builds

rstudio · Mar 2, 2012 · 4e09c53 · 4e09c53
1 parent 748ca4a
commit 4e09c53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/cpp/r/session/graphics/RGraphicsDevice.cpp b/src/cpp/r/session/graphics/RGraphicsDevice.cpp
@@ -779,10 +779,8 @@ void close()
 // for the pango cairo init routine (for linking on other platforms)
 #ifndef PANGO_CAIRO_FOUND
 namespace handler {
-namespace cairo {
 void installCairoHandler() {}
 }
-}
 #endif
 
 } // namespace graphics

diff --git a/src/cpp/r/session/graphics/handler/CMakeLists.txt b/src/cpp/r/session/graphics/handler/CMakeLists.txt
@@ -16,9 +16,8 @@ project (R_GRAPHICS_HANDLER)
 # include files
 file(GLOB_RECURSE R_GRAPHICS_HANDLER_HEADER_FILES "*.h*")
 
-# platform specific source files
-
-if(UNIX)
+# look for pango cairo on linux
+if(UNIX AND NOT APPLE)
    # detect pangocairo
    pkg_check_modules(PANGO_CAIRO pangocairo>=1.14)
    if(PANGO_CAIRO_FOUND)