diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/CLionConfiguration.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/CLionConfiguration.md b/Documentation/CLionConfiguration.md index 9d80243d42..796dbdfd20 100644 --- a/Documentation/CLionConfiguration.md +++ b/Documentation/CLionConfiguration.md @@ -4,28 +4,28 @@ CLion can integrate with CMake to provide code comprehension features. After opening the `serenity` repository in CLion as a new project, the "`Open Project Wizard`" window will open, from here set the following fields: -(Assuming you use `Ninja` as the build system and configured the CMake build directory to `Build/i686`) +(Assuming you use `Ninja` as the build system and configured the CMake build directory to `Build/x86_64`) `Build type`: `Default` -> _CMake will complain with any other build type, make sure to use `Default` so that `CMAKE_BUILD_TYPE` is empty in the `Build/i686/CMakeCache.txt` file._ +> _CMake will complain with any other build type, make sure to use `Default` so that `CMAKE_BUILD_TYPE` is empty in the `Build/x86_64/CMakeCache.txt` file._ `CMake Options`: ``` -GNinja --DCMAKE_TOOLCHAIN_FILE=$CMakeProjectDir$/Build/i686/CMakeToolchain.txt +-DCMAKE_TOOLCHAIN_FILE=$CMakeProjectDir$/Build/x86_64/CMakeToolchain.txt -DCMAKE_PREFIX_PATH=$CMakeProjectDir$/Build/lagom-install --DSERENITY_ARCH=i686 +-DSERENITY_ARCH=x86_64 ``` > CLion will complain that the toolchain file doesn't exist yet, if you haven't `cmake` for the SuperBuild step before. The SuperBuild configure step creates the Toolchain file. -> To re-create the file after blasting your build directory, run `cmake -GNinja -S Meta/CMake/Superbuild -B Build/superbuild-i686` from the top level in a terminal, or simply run `./Meta/serenity.sh run` +> To re-create the file after blasting your build directory, run `cmake -GNinja -S Meta/CMake/Superbuild -B Build/superbuild-x86_64` from the top level in a terminal, or simply run `./Meta/serenity.sh run` -`Build Directory`: `Build/i686` +`Build Directory`: `Build/x86_64` > _If you have not built the Toolchain at this point, please do so: `./Toolchain/BuildIt.sh`_ -> _If you have not built host tools from Lagom at this point, please do so: `./Meta/serenity.sh build` or `ninja -C Build/superbuild-i686` after running `cmake -GNinja -S Meta/CMake/Superbuild -B Build/superbuild-i686`_ +> _If you have not built host tools from Lagom at this point, please do so: `./Meta/serenity.sh build` or `ninja -C Build/superbuild-x86_64` after running `cmake -GNinja -S Meta/CMake/Superbuild -B Build/superbuild-x86_64`_ If you already have the project open, you can go to `File -> Settings -> Build, Execution, Deployment -> CMake` to find these options. |