From 2e46bf1e3a93946baffe61ba25646bcd1b7daf34 Mon Sep 17 00:00:00 2001 From: David Wells <drwells@vt.edu> Date: Wed, 26 Aug 2015 09:31:06 -0400 Subject: [PATCH] Update the example cmake output. The options provided by cmake have changed slightly since this was originally written. --- doc/users/cmake.html | 11 +++++++---- doc/users/cmakelists.html | 36 +++++++++++++++++------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/doc/users/cmake.html b/doc/users/cmake.html index 12b3b99714..6e24b94e43 100644 --- a/doc/users/cmake.html +++ b/doc/users/cmake.html @@ -208,26 +208,29 @@ cmake -DDEAL_II_WITH_MPI=ON <...> <pre class="cmake"> ### # -# The following targets are available (invoke via $ make <target>): +# The following targets are available (invoke by $ make <target>): # # all - compile the library and all enabled components # clean - remove all generated files # install - install into CMAKE_INSTALL_PREFIX -# help - print this help message in the toplevel directory, -# otherwise print a list of targets (in subdirectories) +# +# info - print this help message +# help - print a list of valid top level targets # # edit_cache - run ccmake for changing (cached) configuration variables # and reruns the configure and generate phases of CMake # rebuild_cache - rerun the configure and generate phases of CMake # +# compat_files - build and install component 'compat_files' # documentation - build and install component 'documentation' # examples - build and install component 'examples' # library - build and install component 'library' # parameter_gui - build and install component 'parameter_gui' +# package - build binary package # # test - run a minimal set of tests # -# setup_tests - set up the testsuite subprojects +# setup_tests - set up testsuite subprojects # prune_tests - remove all testsuite subprojects # ### diff --git a/doc/users/cmakelists.html b/doc/users/cmakelists.html index 8f7e30a6d7..e3cacfa10d 100644 --- a/doc/users/cmakelists.html +++ b/doc/users/cmakelists.html @@ -679,34 +679,32 @@ $ cd step-1 $ cmake . [...] - ### # -# Successfully set up project step-1 with deal.II-8.0 +# Project step-1 set up with deal.II-8.3 found at # /usr # -# CMAKE_BUILD_TYPE: Debug +# CMAKE_BUILD_TYPE: Debug # # You can now run -# $ make - to compile and link the program -# $ make run - to (compile, link and) run the program -# -# $ make debug - to switch the build type to Debug -# $ make release - to switch the build type to Release +# $ make - to compile and link the program +# $ make run - to (compile, link and) run the program # -# $ make edit_cache - to change (cached) configuration variables -# and rerun the configure and generate phases of CMake +# $ make debug - to switch the build type to 'Debug' +# $ make release - to switch the build type to 'Release' # -# $ make strip_comments - strip the source files in this -# directory off the documentation comments -# $ make clean - to remove the generated executable as well as -# all intermediate compilation files -# $ make runclean - to remove all output generated by the program -# $ make distclean - to clean the directory from _all_ generated -# files (includes clean, runclean and the removal -# of the generated build system) +# $ make edit_cache - to change (cached) configuration variables +# and rerun the configure and generate phases of CMake # -# $ make help - to view this message again +# $ make strip_comments - to strip the source files in this +# directory off the documentation comments +# $ make clean - to remove the generated executable as well as +# all intermediate compilation files +# $ make runclean - to remove all output generated by the program +# $ make distclean - to clean the directory from _all_ generated +# files (includes clean, runclean and the removal +# of the generated build system) +# $ make info - to view this message again # # Have a nice day! # -- 2.39.5