diff options
| author | Paul Redmond <paul.redmond@gmail.com> | 2020-05-26 14:20:24 -0400 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-05-29 20:21:10 +0200 |
| commit | 4d4e578edfde7299cfbebce8af9f34b82b0fbd21 (patch) | |
| tree | a37279fa95d4556c55fa8f81ada75efc7dec4fca /Toolchain | |
| parent | b0b03c52af284e1473361bd211d8ad422f24faee (diff) | |
| download | serenity-4d4e578edfde7299cfbebce8af9f34b82b0fbd21.zip | |
Ports: Fix CMake-based ports
The SDL port failed to build because the CMake toolchain filed pointed
to the old root. Now the toolchain file assumes that the Root is in
Build/Root.
Additionally, the AK/ and Kernel/ headers need to be installed in the
root too.
Diffstat (limited to 'Toolchain')
| -rw-r--r-- | Toolchain/CMakeToolchain.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Toolchain/CMakeToolchain.txt b/Toolchain/CMakeToolchain.txt index 879b82bd13..85e74162d7 100644 --- a/Toolchain/CMakeToolchain.txt +++ b/Toolchain/CMakeToolchain.txt @@ -7,10 +7,10 @@ endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions") # where to read from/write to -set(CMAKE_SYSROOT $ENV{SERENITY_ROOT}/Root) -set(CMAKE_STAGING_PREFIX $ENV{SERENITY_ROOT}/Root/usr) -set(CMAKE_INSTALL_PREFIX $ENV{SERENITY_ROOT}/Root/usr) -set(CMAKE_INSTALL_DATAROOTDIR $ENV{SERENITY_ROOT}/Root/usr/share) +set(CMAKE_SYSROOT $ENV{SERENITY_ROOT}/Build/Root) +set(CMAKE_STAGING_PREFIX $ENV{SERENITY_ROOT}/Build/Root/usr) +set(CMAKE_INSTALL_PREFIX $ENV{SERENITY_ROOT}/Build/Root/usr) +set(CMAKE_INSTALL_DATAROOTDIR $ENV{SERENITY_ROOT}/Build/Root/usr/share) set(CMAKE_C_COMPILER i686-pc-serenity-gcc) set(CMAKE_CXX_COMPILER i686-pc-serenity-g++) |