GUACAMOLE-1026: Merge remove build flag ALLOW_IN_SOURCE_BUILD when building FreeRDP.

This commit is contained in:
Virtually Nick 2024-06-10 14:40:41 -04:00 committed by GitHub
commit 9b06eccc54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions

View File

@ -85,7 +85,6 @@ ARG WITH_LIBWEBSOCKETS='v\d+(\.\d+)+'
#
ARG FREERDP_OPTS="\
-DALLOW_IN_SOURCE_BUILD=ON \
-DBUILTIN_CHANNELS=OFF \
-DCHANNEL_URBDRC=OFF \
-DWITH_ALSA=OFF \

View File

@ -84,15 +84,21 @@ install_from_git() {
# Configure build using CMake or GNU Autotools, whichever happens to be
# used by the library being built
if [ -e CMakeLists.txt ]; then
cmake -DCMAKE_INSTALL_PREFIX:PATH="$PREFIX_DIR" "$@" .
cmake \
-B "${REPO_DIR}-build" -S . \
-DCMAKE_INSTALL_PREFIX:PATH="$PREFIX_DIR" \
"$@"
# Build and install
cmake --build "${REPO_DIR}-build"
cmake --install "${REPO_DIR}-build"
else
[ -e configure ] || autoreconf -fi
./configure --prefix="$PREFIX_DIR" "$@"
# Build and install
make && make install
fi
# Build and install
make && make install
}
#