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(a)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
Show replies by date
Signed-off-by: Jaroslav Škarvada <jskarvad(a)redhat.com>
---
CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1af563..9ff0b37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,9 @@ set(GR_INCLUDE_DIR include)
set(GR_DATA_DIR share)
set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
set(GR_DOC_DIR ${GR_DATA_DIR}/doc)
-set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
+if (NOT GR_PKG_DOC_DIR)
+ set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
+endif()
set(GR_CONF_DIR etc)
set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)
set(GR_LIBEXEC_DIR libexec)
--
1.8.1.4