From 76d816bc78e98b9494de930fb744900e87675b48 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <burchardt@igpm.rwth-aachen.de>
Date: Fri, 17 Jan 2014 14:06:53 +0000
Subject: [PATCH] [cmake] Build documentation and minor fixes.
[[Imported from SVN: r12691]]
---
CMakeLists.txt | 2 ++
doc/CMakeLists.txt | 1 +
doc/doxygen/CMakeLists.txt | 2 ++
m4/CMakeLists.txt | 2 +-
4 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 doc/CMakeLists.txt
create mode 100644 doc/doxygen/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc25d960..db9b193d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@ include(DuneMacros)
dune_project()
+add_subdirectory("doc")
add_subdirectory("dune")
+add_subdirectory("m4")
finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 00000000..42829857
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(doxygen)
diff --git a/doc/doxygen/CMakeLists.txt b/doc/doxygen/CMakeLists.txt
new file mode 100644
index 00000000..f7b8ea5c
--- /dev/null
+++ b/doc/doxygen/CMakeLists.txt
@@ -0,0 +1,2 @@
+# shortcut for creating the Doxyfile.in and Doxyfile
+add_doxygen_target()
diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt
index 99685c35..2c84197c 100644
--- a/m4/CMakeLists.txt
+++ b/m4/CMakeLists.txt
@@ -1,4 +1,4 @@
install(FILES
dune-solvers.m4
- ipopt4.m4
+ ipopt.m4
DESTINATION share/dune/aclocal)
--
GitLab