diff options
| author | Tom Rondeau | 2011-10-22 14:25:13 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-22 14:25:13 -0400 |
| commit | da5563356afe3f50eb2560b5106a81776da7a43f (patch) | |
| tree | b2c9c7bb0a1e8948f2507a38e595e5cc557799d7 /gr-wxgui | |
| parent | 1468be3299036606b678664ba84d0c0870266c9c (diff) | |
| parent | 31268cfb68965dbcf3df4912059f0c5b6d744626 (diff) | |
| download | gnuradio-da5563356afe3f50eb2560b5106a81776da7a43f.tar.gz gnuradio-da5563356afe3f50eb2560b5106a81776da7a43f.tar.bz2 gnuradio-da5563356afe3f50eb2560b5106a81776da7a43f.zip | |
Merge remote branch 'jblum/cmake_fixes' into next
Diffstat (limited to 'gr-wxgui')
| -rw-r--r-- | gr-wxgui/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 54fe4fb64..5beb39f5e 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -29,7 +29,7 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True # Register component ######################################################################## include(GrComponent) -GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI +GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_GR_WXGUI ENABLE_GR_CORE ENABLE_PYTHON NUMPY_FOUND @@ -39,7 +39,7 @@ GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_WXGUI ######################################################################## # Begin conditional configuration ######################################################################## -if(ENABLE_WXGUI) +if(ENABLE_GR_WXGUI) ######################################################################## # Setup CPack components @@ -80,4 +80,4 @@ install( add_subdirectory(grc) add_subdirectory(src/python) -endif(ENABLE_WXGUI) +endif(ENABLE_GR_WXGUI) |