16 files changed, 50 insertions, 19 deletions
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt
index d874ae3cf6..c6ca6192dd 100644
--- a/gr-analog/CMakeLists.txt
+++ b/gr-analog/CMakeLists.txt
@@ -60,10 +60,12 @@ add_subdirectory(docs)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/analog)
-    add_subdirectory(grc)
     add_subdirectory(examples)
     add_subdirectory(examples/tags)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Create Pkg Config File
diff --git a/gr-audio/CMakeLists.txt b/gr-audio/CMakeLists.txt
index a43a58c6b7..6f373b7b94 100644
--- a/gr-audio/CMakeLists.txt
+++ b/gr-audio/CMakeLists.txt
@@ -51,11 +51,12 @@ add_subdirectory(docs)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/audio)
-    add_subdirectory(grc)
     add_subdirectory(examples/python)
     add_subdirectory(examples/grc)
 endif(ENABLE_PYTHON)
-
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 if(ENABLE_GR_ANALOG)
   add_subdirectory(examples/c++)
 endif(ENABLE_GR_ANALOG)
diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt
index 34fac58823..86ad046d16 100644
--- a/gr-blocks/CMakeLists.txt
+++ b/gr-blocks/CMakeLists.txt
@@ -56,10 +56,12 @@ add_subdirectory(lib)
 if(ENABLE_PYTHON)
      add_subdirectory(python/blocks)
      add_subdirectory(swig)
-     add_subdirectory(grc)
      add_subdirectory(docs)
      add_subdirectory(examples)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Create Pkg Config File
diff --git a/gr-channels/CMakeLists.txt b/gr-channels/CMakeLists.txt
index 5d073e1c66..a508362be0 100644
--- a/gr-channels/CMakeLists.txt
+++ b/gr-channels/CMakeLists.txt
@@ -57,9 +57,11 @@ add_subdirectory(lib)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/channels)
-    add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 add_subdirectory(docs)
 
 ########################################################################
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index 7de895f09b..bc02e96331 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt
@@ -61,9 +61,11 @@ add_subdirectory(docs)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/digital)
-    add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Create Pkg Config File
diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt
index 11488ac413..119837ace4 100644
--- a/gr-dtv/CMakeLists.txt
+++ b/gr-dtv/CMakeLists.txt
@@ -57,10 +57,12 @@ add_subdirectory(lib)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/dtv)
-    add_subdirectory(grc)
     add_subdirectory(examples)
     add_subdirectory(apps)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 add_subdirectory(docs)
 
 ########################################################################
diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt
index adb2a941fd..be554db7ef 100644
--- a/gr-fec/CMakeLists.txt
+++ b/gr-fec/CMakeLists.txt
@@ -59,8 +59,10 @@ if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/fec)
     add_subdirectory(python/fec/LDPC)
-    add_subdirectory(grc)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 add_subdirectory(examples)
 add_subdirectory(docs)
 add_subdirectory(ldpc_alist)
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt
index 992ca5ca86..4bf8263965 100644
--- a/gr-fft/CMakeLists.txt
+++ b/gr-fft/CMakeLists.txt
@@ -55,8 +55,10 @@ add_subdirectory(lib)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/fft)
-    add_subdirectory(grc)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 add_subdirectory(docs)
 
 ########################################################################
diff --git a/gr-filter/CMakeLists.txt b/gr-filter/CMakeLists.txt
index fd5f3cc25c..ed1e52ab91 100644
--- a/gr-filter/CMakeLists.txt
+++ b/gr-filter/CMakeLists.txt
@@ -60,9 +60,11 @@ if(ENABLE_PYTHON)
     add_subdirectory(python/filter)
     add_subdirectory(python/filter/design)
     add_subdirectory(python/filter/gui)
-    add_subdirectory(grc)
     add_subdirectory(apps)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 add_subdirectory(examples)
 add_subdirectory(docs)
 
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
index a418f457f3..b0b109f55c 100644
--- a/gr-qtgui/CMakeLists.txt
+++ b/gr-qtgui/CMakeLists.txt
@@ -80,12 +80,14 @@ add_subdirectory(lib)
 add_subdirectory(docs)
 add_subdirectory(examples/c++)
 if(ENABLE_PYTHON)
-    add_subdirectory(grc)
     add_subdirectory(swig)
     add_subdirectory(python/qtgui)
     add_subdirectory(examples)
     add_subdirectory(apps)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Create Pkg Config File
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt
index 2de5c04a0a..af4d94ae66 100644
--- a/gr-trellis/CMakeLists.txt
+++ b/gr-trellis/CMakeLists.txt
@@ -61,8 +61,10 @@ if(ENABLE_PYTHON)
     add_subdirectory(python/trellis)
     add_subdirectory(examples/python)
     add_subdirectory(examples/grc)
-    add_subdirectory(grc)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Create Pkg Config File
diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt
index 74c8159274..e136d4f97f 100644
--- a/gr-uhd/CMakeLists.txt
+++ b/gr-uhd/CMakeLists.txt
@@ -59,10 +59,12 @@ add_subdirectory(examples/c++)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/uhd)
-    add_subdirectory(grc)
     add_subdirectory(apps)
     add_subdirectory(examples/grc)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Create Pkg Config File
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
index 0496ceeaa4..e03d787828 100644
--- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
+++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
@@ -190,11 +190,13 @@ add_custom_target(uninstall
 ########################################################################
 add_subdirectory(include/howto)
 add_subdirectory(lib)
-add_subdirectory(swig)
-add_subdirectory(python)
-add_subdirectory(grc)
 add_subdirectory(apps)
 add_subdirectory(docs)
+add_subdirectory(swig)
+add_subdirectory(python)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Install cmake search helper for this library
diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt
index a171535c37..4067006dfe 100644
--- a/gr-video-sdl/CMakeLists.txt
+++ b/gr-video-sdl/CMakeLists.txt
@@ -50,10 +50,12 @@ if(ENABLE_GR_VIDEO_SDL)
 add_subdirectory(include/gnuradio/video_sdl)
 add_subdirectory(lib)
 if(ENABLE_PYTHON)
-    add_subdirectory(grc)
     add_subdirectory(swig)
     add_subdirectory(python/video_sdl)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Create Pkg Config File
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index e90ba29727..cab10fdf84 100644
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@ -80,9 +80,11 @@ add_subdirectory(docs)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/vocoder)
-    add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Create Pkg Config File
diff --git a/gr-zeromq/CMakeLists.txt b/gr-zeromq/CMakeLists.txt
index 1ebd0ff4f5..39977ce45e 100644
--- a/gr-zeromq/CMakeLists.txt
+++ b/gr-zeromq/CMakeLists.txt
@@ -55,9 +55,11 @@ add_subdirectory(lib)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/zeromq)
-    add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
+if(ENABLE_GRC)
+    add_subdirectory(grc)
+endif(ENABLE_GRC)
 
 ########################################################################
 # Create Pkg Config File