From 99e0d8de2f83fa5145f1e01b2d5929a00abc8f71 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 25 Dec 2019 23:17:10 +0100 Subject: [PATCH] Toolchain: Fixup CMake toolchain script to install things in /usr Also stop clobbering the host's /usr/local/share for DATAROOTDIR. --- Toolchain/CMakeToolchain.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Toolchain/CMakeToolchain.txt b/Toolchain/CMakeToolchain.txt index 835d410eb1..879b82bd13 100644 --- a/Toolchain/CMakeToolchain.txt +++ b/Toolchain/CMakeToolchain.txt @@ -8,8 +8,9 @@ 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) -set(CMAKE_INSTALL_PREFIX $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_C_COMPILER i686-pc-serenity-gcc) set(CMAKE_CXX_COMPILER i686-pc-serenity-g++)