diff options
author | Friedemann Kleint <[email protected]> | 2024-06-04 15:47:04 +0200 |
---|---|---|
committer | Friedemann Kleint <[email protected]> | 2024-06-04 21:17:28 +0200 |
commit | 1ddf80fe9336dc3b47e4455ae6118c3cf6fab002 (patch) | |
tree | 44f95686977c73a32620ba605a79a2538e996e6e | |
parent | 11afd18d34c17a345315d226b6124dc1fd31d12c (diff) |
Examples: Update CMake instructions
Remove -S and use -DCMAKE_C_COMPILER=cl.exe consistently.
Pick-to: 6.7
Change-Id: I73a4e9aaf37bb082d8a4398113c8752caebf9358
Reviewed-by: Shyamnath Premnadh <[email protected]>
-rw-r--r-- | examples/samplebinding/doc/samplebinding.rst | 16 | ||||
-rw-r--r-- | examples/scriptableapplication/doc/scriptableapplication.rst | 13 | ||||
-rw-r--r-- | examples/widgetbinding/doc/widgetbinding.md | 14 |
3 files changed, 26 insertions, 17 deletions
diff --git a/examples/samplebinding/doc/samplebinding.rst b/examples/samplebinding/doc/samplebinding.rst index defb55d6b..51b6b4c20 100644 --- a/examples/samplebinding/doc/samplebinding.rst +++ b/examples/samplebinding/doc/samplebinding.rst @@ -165,23 +165,27 @@ Using CMake You can build and run this example by executing the following commands (slightly adapted to your file system layout) in a terminal: -macOS/Linux: +Run CMake on macOS/Linux: .. code-block:: bash cd ~/pyside-setup/examples/samplebinding + mkdir build + cd build + cmake .. -B. -G Ninja -DCMAKE_BUILD_TYPE=Release -On Windows: +Run CMake on Windows: .. code-block:: bash cd C:\pyside-setup\examples\samplebinding - -.. code-block:: bash - mkdir build cd build - cmake -S.. -B. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=cl.exe + cmake .. -B. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=cl.exe + +To build: + +.. code-block:: bash ninja ninja install cd .. diff --git a/examples/scriptableapplication/doc/scriptableapplication.rst b/examples/scriptableapplication/doc/scriptableapplication.rst index 146911f13..bbabb1247 100644 --- a/examples/scriptableapplication/doc/scriptableapplication.rst +++ b/examples/scriptableapplication/doc/scriptableapplication.rst @@ -72,21 +72,22 @@ macOS/Linux: .. code-block:: bash cd ~/pyside-setup/examples/scriptableapplication + mkdir build + cd build + cmake .. -B. -G Ninja -DCMAKE_BUILD_TYPE=Release + ninja + ./scriptableapplication On Windows: .. code-block:: bash cd C:\pyside-setup\examples\scriptableapplication - - -.. code-block:: bash - mkdir build cd build - cmake -S.. -B. -G Ninja -DCMAKE_BUILD_TYPE=Release + cmake .. -B. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=cl.exe ninja - ./scriptableapplication + .\scriptableapplication.exe Using QMake +++++++++++ diff --git a/examples/widgetbinding/doc/widgetbinding.md b/examples/widgetbinding/doc/widgetbinding.md index 6355ea311..910961b1e 100644 --- a/examples/widgetbinding/doc/widgetbinding.md +++ b/examples/widgetbinding/doc/widgetbinding.md @@ -40,20 +40,24 @@ The most important files are: Now create a `build/` directory, and from inside run `cmake` to use the provided `CMakeLists.txt`: -macOS/Linux: +Run CMake on macOS/Linux: ```bash cd ~/pyside-setup/examples/widgetbinding +cd build +cmake .. -B. -G Ninja -DCMAKE_BUILD_TYPE=Release ``` -On Windows: +Run CMake on Windows: ```bash cd C:\pyside-setup\examples\widgetbinding +mkdir build +cd build +cmake .. -B. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=cl.exe ``` +To build: ```bash -mkdir build -cd build -cmake -S.. -B. -G Ninja -DCMAKE_BUILD_TYPE=Release + ninja ninja install cd .. |