diff options
| author | Johnathan Corgan | 2011-12-11 13:07:11 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2011-12-11 13:07:11 -0800 |
| commit | c51087bb7f005981f4b74c6a48f59a5982721951 (patch) | |
| tree | 07905082947d982034a5b3b2f4426a3c3a203d0b /cmake/Modules | |
| parent | 912cd08e133dae9fa9ceec055ba23cd970a0c254 (diff) | |
| parent | fe21bc676424196a228ba4fe9c924e3ae1954e07 (diff) | |
| download | gnuradio-c51087bb7f005981f4b74c6a48f59a5982721951.tar.gz gnuradio-c51087bb7f005981f4b74c6a48f59a5982721951.tar.bz2 gnuradio-c51087bb7f005981f4b74c6a48f59a5982721951.zip | |
Merge branch 'master' into next
Conflicts:
config/lf_warnings.m4
volk/config/lf_warnings.m4
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index 47e18085b..f49fc731c 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -33,8 +33,7 @@ include(GrPython) # - GR_SWIG_DOCS_TARGET_DEPS ######################################################################## function(GR_SWIG_MAKE_DOCS output_file) - find_package(Doxygen) - if(DOXYGEN_FOUND) + if(ENABLE_DOXYGEN) #setup the input files variable list, quote formated set(input_files) @@ -84,9 +83,9 @@ function(GR_SWIG_MAKE_DOCS output_file) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docs/doxygen ) - else(DOXYGEN_FOUND) + else(ENABLE_DOXYGEN) file(WRITE ${output_file} "\n") #no doxygen -> empty file - endif(DOXYGEN_FOUND) + endif(ENABLE_DOXYGEN) endfunction(GR_SWIG_MAKE_DOCS) ######################################################################## |