From 8d0080eef694558cca941ac2af1092d26aa245bd Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 14 Mar 2021 19:58:51 +0800 Subject: [PATCH] doc/dev: update to adapt the cmake+ninja transition Signed-off-by: Kefu Chai --- doc/dev/cpu-profiler.rst | 24 ++++++++---------------- doc/dev/documenting.rst | 2 +- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/doc/dev/cpu-profiler.rst b/doc/dev/cpu-profiler.rst index 5b06a47919c1b..3885293cd28d5 100644 --- a/doc/dev/cpu-profiler.rst +++ b/doc/dev/cpu-profiler.rst @@ -19,25 +19,17 @@ executing the following:: Compiling Ceph for Profiling ============================ -To compile Ceph for profiling, first clean everything. :: +To compile Ceph for profiling, first clean everything. :: - make distclean + git clean -dfx -Then, export the following settings so that you can see callgraph output. :: +Finally, compile Ceph. :: - export CFLAGS="-fno-omit-frame-pointer -O2 -g" - -Finally, compile Ceph. :: - - ./autogen.sh - ./configure - make - -You can use ``make -j`` to execute multiple jobs depending upon your system. For -example:: - - make -j4 + ./do-cmake.sh -DCMAKE_CXX_FLAGS="-fno-omit-frame-pointer -O2 -g" + cd build + cmake --build . +In this command, ``CMAKE_CXX_FLAGS`` is specified. This provides callgraph output. Ceph Configuration ================== @@ -51,4 +43,4 @@ for details. See the `CPU Profiling`_ section of the RADOS Troubleshooting documentation for details on using Oprofile. -.. _CPU Profiling: ../../rados/troubleshooting/cpu-profiling \ No newline at end of file +.. _CPU Profiling: ../../rados/troubleshooting/cpu-profiling diff --git a/doc/dev/documenting.rst b/doc/dev/documenting.rst index 42bd56d06fed5..1e10776ce037e 100644 --- a/doc/dev/documenting.rst +++ b/doc/dev/documenting.rst @@ -55,7 +55,7 @@ To generate the doxygen documentation in HTML format use: :: - # make doxygen + # cmake --build . --target doxygen HTML output will be under: ``build-doc/doxygen/html`` -- 2.39.5