[PATCH 1/2] doxygen package needs to be detetected before the doxygen is used

Jaroslav Škarvada jskarvad at redhat.com
Tue Apr 9 16:33:10 UTC 2013


Without this patch the DOXYGEN_EXECUTABLE is set too late which results
in build failure when processing swig directory (with ENABLE_DOXYGEN).

Signed-off-by: Jaroslav Škarvada <jskarvad at redhat.com>
---
 CMakeLists.txt      | 1 +
 docs/CMakeLists.txt | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9334c8..a1af563 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,7 @@ find_package(GnuradioFCD)
 find_package(LibOsmoSDR)
 find_package(LibRTLSDR)
 find_package(LibMiriSDR)
+find_package(Doxygen)
 
 if(NOT GRUEL_FOUND)
     message(FATAL_ERROR "Gruel required to compile osmosdr")
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index f16fbf6..446b86a 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -18,11 +18,6 @@
 # Boston, MA 02110-1301, USA.
 
 ########################################################################
-# Setup dependencies
-########################################################################
-find_package(Doxygen)
-
-########################################################################
 # Begin conditional configuration
 ########################################################################
 if(ENABLE_DOXYGEN)
-- 
1.8.1.4





More information about the osmocom-sdr mailing list