diff options
| author | Johnathan Corgan | 2011-12-11 22:32:16 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2011-12-11 22:32:18 -0800 |
| commit | e6a648a80786f58b79689a4cc5697aecf38f3f08 (patch) | |
| tree | 5d9e6b35f8d2cff75ae50edfd892f844caf64697 | |
| parent | c51087bb7f005981f4b74c6a48f59a5982721951 (diff) | |
| parent | fc6151d4516ee86b697602014b83fb08a88c30f0 (diff) | |
| download | gnuradio-e6a648a80786f58b79689a4cc5697aecf38f3f08.tar.gz gnuradio-e6a648a80786f58b79689a4cc5697aecf38f3f08.tar.bz2 gnuradio-e6a648a80786f58b79689a4cc5697aecf38f3f08.zip | |
Merge branch 'master' into next
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-qtgui/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b966d3313..62eae906b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -201,6 +201,7 @@ install( ######################################################################## # Add subdirectories (in order of deps) ######################################################################## +add_subdirectory(docs) add_subdirectory(gruel) add_subdirectory(gnuradio-core) add_subdirectory(grc) @@ -221,7 +222,6 @@ add_subdirectory(gr-vocoder) add_subdirectory(gr-wxgui) add_subdirectory(gnuradio-examples/grc) add_subdirectory(gnuradio-examples/python) -add_subdirectory(docs) #finalize cpack after subdirs processed include(GrPackage) diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index 3e870eee9..a8fead401 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -23,7 +23,6 @@ include(GrBoost) find_package(Qt4 4.2.0 COMPONENTS QtCore QtGui) -include(${QT_USE_FILE}) #sets up the environment find_package(Qwt) @@ -63,6 +62,8 @@ GR_SET_GLOBAL(GR_QTGUI_INCLUDE_DIRS ######################################################################## if(ENABLE_GR_QTGUI) +include(${QT_USE_FILE}) #sets up the environment + ######################################################################## # Setup CPack components ######################################################################## |