Flexibility updates for Linux setup

dpaulat · Dec 30, 2023 · cac240d · cac240d
1 parent a222c7d
commit cac240d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/setup-debug.sh b/setup-debug.sh
@@ -1,5 +1,15 @@
 #!/bin/bash
 ./tools/setup-common.sh
-mkdir -p build-debug
-cd build-debug
-cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.6.1/gcc_64 ..
+
+build_dir=${1:-build-debug}
+build_type=Debug
+qt_version=6.6.1
+script_dir="$(dirname "$(readlink -f "$0")")"
+
+mkdir -p ${build_dir}
+cmake -B ${build_dir} -S . \
+	-DCMAKE_BUILD_TYPE=${build_type} \
+	-DCMAKE_CONFIGURATION_TYPES=${build_type} \
+	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \
+	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/gcc_64 \
+	-G Ninja
diff --git a/setup-release.sh b/setup-release.sh
@@ -1,5 +1,15 @@
 #!/bin/bash
 ./tools/setup-common.sh
-mkdir -p build-release
-cd build-release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.6.1/gcc_64 ..
+
+build_dir=${1:-build-release}
+build_type=Release
+qt_version=6.6.1
+script_dir="$(dirname "$(readlink -f "$0")")"
+
+mkdir -p ${build_dir}
+cmake -B ${build_dir} -S . \
+	-DCMAKE_BUILD_TYPE=${build_type} \
+	-DCMAKE_CONFIGURATION_TYPES=${build_type} \
+	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \
+	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/gcc_64 \
+	-G Ninja
diff --git a/tools/setup-common.sh b/tools/setup-common.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-pip install "conan<2.0"
-pip install geopandas
-pip install GitPython
+pip install --upgrade --user --break-system-packages "conan<2.0"
+pip install --upgrade --user --break-system-packages geopandas
+pip install --upgrade --user --break-system-packages GitPython
 conan profile new default --detect