diff options
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/Doxyfile.in | 2 | ||||
| -rw-r--r-- | doc/examples/Tutorial_simple_example_dynamic_size.cpp | 2 | ||||
| -rw-r--r-- | doc/examples/Tutorial_simple_example_fixed_size.cpp | 2 |
5 files changed, 17 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38a7fceab..91f4a24f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,17 @@ PROJECT(Eigen) -SET(EIGEN_VERSION "2.0-alpha7 (svn)") +SET(EIGEN_VERSION_NUMBER "2.0-beta1") + +#if the svnversion program is absent, this will leave the SVN_REVISION string empty, +#but won't stop CMake. +EXECUTE_PROCESS(COMMAND svnversion -n ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE EIGEN_SVN_REVISION) + +IF(EIGEN_SVN_REVISION) +SET(EIGEN_VERSION "${EIGEN_VERSION_NUMBER} (SVN revision ${EIGEN_SVN_REVISION})") +ELSE(EIGEN_SVN_REVISION) +SET(EIGEN_VERSION "${EIGEN_VERSION_NUMBER}") +ENDIF(EIGEN_SVN_REVISION) + CMAKE_MINIMUM_REQUIRED(VERSION 2.4) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 36d65efbb..e2a31978c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -31,6 +31,7 @@ ADD_SUBDIRECTORY(snippets) ADD_CUSTOM_TARGET( doc ALL + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/html/ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/eigendoxy_tabs.css ${CMAKE_CURRENT_BINARY_DIR}/html/ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Eigen_Silly_Professor_64x64.png diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 2ffcce036..5045598ba 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -32,7 +32,7 @@ PROJECT_NAME = Eigen # if some version control system is used. #EIGEN_VERSION is set in the root CMakeLists.txt -PROJECT_NUMBER = ${EIGEN_VERSION} +PROJECT_NUMBER = "${EIGEN_VERSION}" # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/doc/examples/Tutorial_simple_example_dynamic_size.cpp b/doc/examples/Tutorial_simple_example_dynamic_size.cpp index 93486e6a0..19cfa6af5 100644 --- a/doc/examples/Tutorial_simple_example_dynamic_size.cpp +++ b/doc/examples/Tutorial_simple_example_dynamic_size.cpp @@ -3,7 +3,7 @@ // import most common Eigen's types USING_PART_OF_NAMESPACE_EIGEN -int main(int argc, char *argv[]) +int main(int, char *[]) { for (int size=1; size<=4; ++size) { diff --git a/doc/examples/Tutorial_simple_example_fixed_size.cpp b/doc/examples/Tutorial_simple_example_fixed_size.cpp index e3691d83a..6dd7ebf90 100644 --- a/doc/examples/Tutorial_simple_example_fixed_size.cpp +++ b/doc/examples/Tutorial_simple_example_fixed_size.cpp @@ -3,7 +3,7 @@ // import most common Eigen's types USING_PART_OF_NAMESPACE_EIGEN -int main(int argc, char *argv[]) +int main(int, char *[]) { Matrix3f m3; m3 << 1, 2, 3, 4, 5, 6, 7, 8, 9; |