summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Beutner <gunnar@beutner.name>2021-04-15 13:32:29 +0200
committerAndreas Kling <kling@serenityos.org>2021-04-16 19:04:24 +0200
commit594d480391ac7371aaf7837755986fefbed27bec (patch)
tree864331c63736857210b0278838c3eb660c12c6b1
parentc6c1e2037b819ffec0a91a6a2ec3f9c7e1a5a0e3 (diff)
downloadserenity-594d480391ac7371aaf7837755986fefbed27bec.zip
Toolchain+Ports: Move the CMake toolchain file into a subdirectory
-rwxr-xr-xPorts/SDL2/package.sh2
-rwxr-xr-xPorts/SDLPoP/package.sh2
-rwxr-xr-xPorts/Super-Mario/package.sh2
-rwxr-xr-xPorts/c-ray/package.sh2
-rwxr-xr-xPorts/chester/package.sh2
-rwxr-xr-xPorts/cmatrix/package.sh2
-rwxr-xr-xPorts/flatbuffers/package.sh2
-rwxr-xr-xPorts/genemu/package.sh2
-rwxr-xr-xPorts/hatari/package.sh2
-rwxr-xr-xPorts/libzip/package.sh2
-rwxr-xr-xPorts/pt2-clone/package.sh2
-rw-r--r--Toolchain/CMake/CMakeToolchain.txt (renamed from Toolchain/CMakeToolchain.txt)0
12 files changed, 11 insertions, 11 deletions
diff --git a/Ports/SDL2/package.sh b/Ports/SDL2/package.sh
index 3169c6db83..22222e7188 100755
--- a/Ports/SDL2/package.sh
+++ b/Ports/SDL2/package.sh
@@ -4,7 +4,7 @@ version=serenity-git
workdir=SDL-main-serenity
useconfigure=true
files="https://github.com/SerenityOS/SDL/archive/main-serenity.tar.gz SDL2-git.tar.gz"
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt -DPULSEAUDIO=OFF -DJACK=OFF"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt -DPULSEAUDIO=OFF -DJACK=OFF"
configure() {
run cmake $configopts
diff --git a/Ports/SDLPoP/package.sh b/Ports/SDLPoP/package.sh
index 4e688e223f..9dd5646ee1 100755
--- a/Ports/SDLPoP/package.sh
+++ b/Ports/SDLPoP/package.sh
@@ -4,7 +4,7 @@ useconfigure=true
version=git
depends="SDL2 SDL2_image"
workdir=SDLPoP-master
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
files="https://github.com/NagyD/SDLPoP/archive/refs/heads/master.zip PoP.zip"
install_location="Root/opt/PrinceOfPersia"
diff --git a/Ports/Super-Mario/package.sh b/Ports/Super-Mario/package.sh
index e176e4bc0a..ecee9da331 100755
--- a/Ports/Super-Mario/package.sh
+++ b/Ports/Super-Mario/package.sh
@@ -4,7 +4,7 @@ useconfigure=true
version=git
depends="SDL2 SDL2_mixer SDL2_image"
workdir=Super-Mario-Clone-Cpp-master
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
files="https://github.com/Bennyhwanggggg/Super-Mario-Clone-Cpp/archive/refs/heads/master.zip master.zip"
install_location="Root/opt/Super_Mario"
diff --git a/Ports/c-ray/package.sh b/Ports/c-ray/package.sh
index bfafc3fed6..8425a0eceb 100755
--- a/Ports/c-ray/package.sh
+++ b/Ports/c-ray/package.sh
@@ -4,7 +4,7 @@ version=git
workdir=c-ray-master
useconfigure=true
files="https://github.com/vkoskiv/c-ray/archive/master.tar.gz c-ray-git.tar.gz"
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
depends="SDL2"
configure() {
diff --git a/Ports/chester/package.sh b/Ports/chester/package.sh
index 75584b52cc..cf562e1655 100755
--- a/Ports/chester/package.sh
+++ b/Ports/chester/package.sh
@@ -4,7 +4,7 @@ useconfigure=true
version=git
depends="SDL2"
workdir=chester-public
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
files="https://github.com/veikkos/chester/archive/public.tar.gz chester.tar.gz"
configure() {
diff --git a/Ports/cmatrix/package.sh b/Ports/cmatrix/package.sh
index ed0cefa3fd..481942a57e 100755
--- a/Ports/cmatrix/package.sh
+++ b/Ports/cmatrix/package.sh
@@ -4,7 +4,7 @@ useconfigure=true
version=git
depends="ncurses"
workdir=cmatrix-master
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
files="https://github.com/abishekvashok/cmatrix/archive/refs/heads/master.zip cmatrix.zip"
configure() {
diff --git a/Ports/flatbuffers/package.sh b/Ports/flatbuffers/package.sh
index ac104cd5eb..569ee4fa8b 100755
--- a/Ports/flatbuffers/package.sh
+++ b/Ports/flatbuffers/package.sh
@@ -7,7 +7,7 @@ files="https://github.com/google/flatbuffers/archive/refs/tags/v${version}.tar.g
useconfigure=true
# Since we are cross-compiling, we cannot build the tests, because we need
# the flatbuffers compiler to build them
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt -DFLATBUFFERS_BUILD_TESTS=off"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt -DFLATBUFFERS_BUILD_TESTS=off"
configure() {
run cmake $configopts
diff --git a/Ports/genemu/package.sh b/Ports/genemu/package.sh
index 11d20200e2..ed389f9abe 100755
--- a/Ports/genemu/package.sh
+++ b/Ports/genemu/package.sh
@@ -5,7 +5,7 @@ version=git
workdir="${port}-master"
useconfigure=true
files="https://github.com/rasky/genemu/archive/master.tar.gz ${version}.tar.gz"
-configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_ROOT}/Toolchain/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_ROOT}/Toolchain/CMake/CMakeToolchain.txt"
depends="SDL2"
configure() {
diff --git a/Ports/hatari/package.sh b/Ports/hatari/package.sh
index a8a862fd50..35dbbb7bb0 100755
--- a/Ports/hatari/package.sh
+++ b/Ports/hatari/package.sh
@@ -5,7 +5,7 @@ version=2.4.0-devel
depends="SDL2 zlib"
commit=353379e1f8a847cc0e284541d2b40fd49d175d22
workdir="${port}-${commit}"
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
files="https://github.com/hatari/hatari/archive/${commit}.tar.gz ${commit}.tar.gz"
configure() {
diff --git a/Ports/libzip/package.sh b/Ports/libzip/package.sh
index 217ccf847f..1b944c045c 100755
--- a/Ports/libzip/package.sh
+++ b/Ports/libzip/package.sh
@@ -4,7 +4,7 @@ useconfigure=true
version=1.7.3
depends="zlib"
workdir=libzip-${version}
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
files="https://libzip.org/download/libzip-${version}.tar.gz libzip-${version}.tar.gz"
configure() {
diff --git a/Ports/pt2-clone/package.sh b/Ports/pt2-clone/package.sh
index 01717571a9..524dd54ae9 100755
--- a/Ports/pt2-clone/package.sh
+++ b/Ports/pt2-clone/package.sh
@@ -3,7 +3,7 @@ port=pt2-clone
version=1.28
useconfigure=true
files="https://github.com/8bitbubsy/pt2-clone/archive/v${version}.tar.gz v${version}.tar.gz"
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_ROOT/Toolchain/CMake/CMakeToolchain.txt"
depends="SDL2"
configure() {
diff --git a/Toolchain/CMakeToolchain.txt b/Toolchain/CMake/CMakeToolchain.txt
index 43d0538a9c..43d0538a9c 100644
--- a/Toolchain/CMakeToolchain.txt
+++ b/Toolchain/CMake/CMakeToolchain.txt