aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2012-08-27 11:11:25 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2012-08-27 11:11:25 +0200
commit75435079caa4213f86ccb57fe70ceb56c8e62ad1 (patch)
tree2c2dc7ea9ba965a038072807080f37d5e4c51d4b
parentaa1aa36d6da6ed349678975f1d93c7dc415257bc (diff)
fix bug #499: the image was missing because of a dependency issue when building/executing the "special" examples
-rw-r--r--Eigen/src/SuperLUSupport/SuperLUSupport.h6
-rw-r--r--doc/CMakeLists.txt4
-rw-r--r--doc/examples/CMakeLists.txt2
-rw-r--r--doc/special_examples/CMakeLists.txt1
4 files changed, 6 insertions, 7 deletions
diff --git a/Eigen/src/SuperLUSupport/SuperLUSupport.h b/Eigen/src/SuperLUSupport/SuperLUSupport.h
index 11fb014dd..d8a54e18c 100644
--- a/Eigen/src/SuperLUSupport/SuperLUSupport.h
+++ b/Eigen/src/SuperLUSupport/SuperLUSupport.h
@@ -496,8 +496,8 @@ class SuperLU : public SuperLUBase<_MatrixType,SuperLU<_MatrixType> >
SuperLU(const MatrixType& matrix) : Base()
{
- Base::init();
- compute(matrix);
+ init();
+ Base::compute(matrix);
}
~SuperLU()
@@ -833,7 +833,7 @@ class SuperILU : public SuperLUBase<_MatrixType,SuperILU<_MatrixType> >
SuperILU(const MatrixType& matrix) : Base()
{
init();
- compute(matrix);
+ Base::compute(matrix);
}
~SuperILU()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index ad3113344..33bc1d45d 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -34,6 +34,7 @@ set(examples_targets "")
set(snippets_targets "")
add_definitions("-DEIGEN_MAKING_DOCS")
+add_custom_target(all_examples)
add_subdirectory(examples)
add_subdirectory(special_examples)
@@ -74,7 +75,6 @@ add_custom_target(doc ALL
COMMAND ${CMAKE_COMMAND} -E remove eigen-doc/eigen-doc.tgz
COMMAND ${CMAKE_COMMAND} -E tar cvfz eigen-doc/eigen-doc.tgz eigen-doc
COMMAND ${CMAKE_COMMAND} -E rename eigen-doc html
- WORKING_DIRECTORY ${Eigen_BINARY_DIR}/doc
- VERBATIM)
+ WORKING_DIRECTORY ${Eigen_BINARY_DIR}/doc)
add_dependencies(doc doc-eigen-prerequisites doc-unsupported-prerequisites)
diff --git a/doc/examples/CMakeLists.txt b/doc/examples/CMakeLists.txt
index 13ec0c123..71b272a15 100644
--- a/doc/examples/CMakeLists.txt
+++ b/doc/examples/CMakeLists.txt
@@ -1,7 +1,5 @@
file(GLOB examples_SRCS "*.cpp")
-add_custom_target(all_examples)
-
foreach(example_src ${examples_SRCS})
get_filename_component(example ${example_src} NAME_WE)
add_executable(${example} ${example_src})
diff --git a/doc/special_examples/CMakeLists.txt b/doc/special_examples/CMakeLists.txt
index eeeae1d2a..138a2f6ef 100644
--- a/doc/special_examples/CMakeLists.txt
+++ b/doc/special_examples/CMakeLists.txt
@@ -17,4 +17,5 @@ if(QT4_FOUND)
COMMAND Tutorial_sparse_example
ARGS ${CMAKE_CURRENT_BINARY_DIR}/../html/Tutorial_sparse_example.jpeg
)
+ add_dependencies(all_examples Tutorial_sparse_example)
endif(QT4_FOUND)