diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | doc/Doxyfile.in | 22 |
3 files changed, 14 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4135a71e8..0934144b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,14 +7,11 @@ 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})") + SET(EIGEN_VERSION "${EIGEN_VERSION_NUMBER} (SVN revision ${EIGEN_SVN_REVISION})") ELSE(EIGEN_SVN_REVISION) -SET(EIGEN_VERSION "${EIGEN_VERSION_NUMBER}") + SET(EIGEN_VERSION "${EIGEN_VERSION_NUMBER}") ENDIF(EIGEN_SVN_REVISION) -SET(EIGEN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -SET(EIGEN_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) - 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 41a94ddcf..d635dbfab 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -36,7 +36,7 @@ ADD_CUSTOM_TARGET( ${CMAKE_CURRENT_BINARY_DIR}/html/ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Eigen_Silly_Professor_64x64.png ${CMAKE_CURRENT_BINARY_DIR}/html/ - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/buildexamplelist.sh ${EIGEN_SOURCE_DIR} > ${CMAKE_CURRENT_BINARY_DIR}/ExampleList.dox + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/buildexamplelist.sh ${Eigen_SOURCE_DIR} > ${CMAKE_CURRENT_BINARY_DIR}/ExampleList.dox COMMAND doxygen COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cleanhierarchy.sh ${CMAKE_CURRENT_BINARY_DIR}/html/hierarchy.html WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 7e3966c65..52046cd86 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -39,7 +39,7 @@ PROJECT_NUMBER = "${EIGEN_VERSION}" # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = ${EIGEN_BINARY_DIR}/doc +OUTPUT_DIRECTORY = ${Eigen_BINARY_DIR}/doc # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output @@ -556,9 +556,9 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ${EIGEN_SOURCE_DIR}/Eigen \ - ${EIGEN_SOURCE_DIR}/doc \ - ${EIGEN_BINARY_DIR}/doc +INPUT = ${Eigen_SOURCE_DIR}/Eigen \ + ${Eigen_SOURCE_DIR}/doc \ + ${Eigen_BINARY_DIR}/doc # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is @@ -618,10 +618,10 @@ EXCLUDE_SYMBOLS = # directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = ${EIGEN_SOURCE_DIR}/doc/snippets \ - ${EIGEN_BINARY_DIR}/doc/snippets \ - ${EIGEN_SOURCE_DIR}/doc/examples \ - ${EIGEN_BINARY_DIR}/doc/examples +EXAMPLE_PATH = ${Eigen_SOURCE_DIR}/doc/snippets \ + ${Eigen_BINARY_DIR}/doc/snippets \ + ${Eigen_SOURCE_DIR}/doc/examples \ + ${Eigen_BINARY_DIR}/doc/examples # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -771,14 +771,14 @@ HTML_FILE_EXTENSION = .html # each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = ${EIGEN_BINARY_DIR}/doc/eigendoxy_header.html +HTML_HEADER = ${Eigen_BINARY_DIR}/doc/eigendoxy_header.html # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. # the footer has not been customized yet, so let's use the default one -# ${EIGEN_BINARY_DIR}/doc/eigendoxy_footer.html +# ${Eigen_BINARY_DIR}/doc/eigendoxy_footer.html HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading @@ -788,7 +788,7 @@ HTML_FOOTER = # the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = ${EIGEN_SOURCE_DIR}/doc/eigendoxy.css +HTML_STYLESHEET = ${Eigen_SOURCE_DIR}/doc/eigendoxy.css # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, # files or namespaces will be aligned in HTML using tables. If set to |