2 files changed, 1 insertions, 26 deletions
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake
index 189e97c7e..a73e3e6d7 100644
--- a/cmake/Modules/GrMiscUtils.cmake
+++ b/cmake/Modules/GrMiscUtils.cmake
@@ -208,28 +208,3 @@ function(GR_GEN_TARGET_DEPS name var)
         set(${var} "DEPENDS;${name};COMMAND;${name}" PARENT_SCOPE)
     endif()
 endfunction(GR_GEN_TARGET_DEPS)
-
-
-########################################################################
-# Control availability of vmcircbuf methods.
-# For now, only allows disabling of shm methods, which cause uncatchable
-#    segmentation faults on Cygwin with gcc 4.x (x <= 5)
-# Usage:
-#   GR_VMCIRCBUF()
-#
-# Will set TRY_SHM_VMCIRCBUF to 1 by default except on Windows machines.
-# Can manually set with -DTRY_SHM_VMCIRCBUF=0|1
-########################################################################
-function(GR_VMCIRCBUF)
-  if(WIN32)
-    OPTION(TRY_SHM_VMCIRCBUF "Try SHM VMCIRCBUF" OFF)
-  else(WIN32)
-    OPTION(TRY_SHM_VMCIRCBUF "Try SHM VMCIRCBUF" ON)
-  endif(WIN32)
-
-  message(STATUS "TRY_SHM_VMCIRCBUF set to ${TRY_SHM_VMCIRCBUF}.")
-
-  if(TRY_SHM_VMCIRCBUF)
-    add_definitions( -DTRY_SHM_VMCIRCBUF )
-  endif(TRY_SHM_VMCIRCBUF)
-endfunction(GR_VMCIRCBUF)
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake
index ff56faa0d..175d0d759 100644
--- a/cmake/Modules/GrSwig.cmake
+++ b/cmake/Modules/GrSwig.cmake
@@ -67,7 +67,6 @@ function(GR_SWIG_MAKE_DOCS output_file)
         #call doxygen on the Doxyfile + input headers
         add_custom_command(
             OUTPUT ${OUTPUT_DIRECTORY}/xml/index.xml
-	           ${OUTPUT_DIRECTORY}/xml/combine.xslt
             DEPENDS ${input_files} ${GR_SWIG_DOCS_SOURCE_DEPS} ${tag_deps}
             COMMAND ${DOXYGEN_EXECUTABLE} ${OUTPUT_DIRECTORY}/Doxyfile
             COMMENT "Generating doxygen xml for ${name} docs"
@@ -81,6 +80,7 @@ function(GR_SWIG_MAKE_DOCS output_file)
                 ${CMAKE_SOURCE_DIR}/docs/doxygen/swig_doc.py
                 ${OUTPUT_DIRECTORY}/xml
                 ${output_file}
+            COMMENT "Generating python docstrings for ${name}"
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docs/doxygen
         )