diff options
| author | Andrew Kaster <akaster@serenityos.org> | 2021-08-19 22:33:06 -0600 |
|---|---|---|
| committer | Ali Mohammad Pur <Ali.mpfard@gmail.com> | 2021-09-15 19:04:52 +0430 |
| commit | 9dff6acc556c9e7e2eb5ae4ddc5f3310d8e9eb94 (patch) | |
| tree | 60f77eb3b6e5f7c6c3aaa010d491212c1c1932d2 /Ports/cmake | |
| parent | b9e3647e668823aaedd3c6a63f6d0498b4544efd (diff) | |
| download | serenity-9dff6acc556c9e7e2eb5ae4ddc5f3310d8e9eb94.zip | |
Ports: Use new CMakeToolchain.txt located in the build directory
Now that we're generating the CMake toolchain file in the build
directory, we need to redirect the ports that use CMake to the new
location. Looking into this showed that there's still a bunch of work to
do in general to make the ports agnostic to which toolchain they're
using, there's a lot of hard-coded ${ARCH}-pc-serenity-gcc assumptions
still here.
Diffstat (limited to 'Ports/cmake')
| -rwxr-xr-x | Ports/cmake/package.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Ports/cmake/package.sh b/Ports/cmake/package.sh index d8116c6cb0..1b7d7fd4a2 100755 --- a/Ports/cmake/package.sh +++ b/Ports/cmake/package.sh @@ -5,7 +5,7 @@ useconfigure=true files="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz cmake-$version.tar.gz 7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1" auth_type=sha256 depends="bash make sed ncurses libuv" -configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=1 -GNinja" +configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=1 -GNinja" configure() { run cmake $configopts . |