Skip to content

Commit d8f7b6d

Browse files
committed
Enable VST in CI Linux build
1 parent 92288a1 commit d8f7b6d

File tree

6 files changed

+1
-13
lines changed

6 files changed

+1
-13
lines changed

SetupConfigure.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ if(BUILD_CONFIGURATION STREQUAL "UTEST")
256256
set(MUSE_MODULE_MUSESAMPLER OFF)
257257
set(MUSE_MODULE_NETWORK OFF)
258258
set(MUSE_MODULE_SHORTCUTS OFF)
259+
set(MUSE_MODULE_VST OFF)
259260

260261
set(MUE_BUILD_APPSHELL_MODULE OFF)
261262
set(MUSE_MODULE_AUTOBOT OFF)

buildscripts/ci/linux/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ if [ "$PACKARCH" == "aarch64" ] || [ "$PACKARCH" == "armv7l" ]; then
7070
MUSESCORE_BUILD_UPDATE_MODULE="OFF"
7171
fi
7272

73-
# TODO: https://github.com/musescore/MuseScore/issues/11689
74-
BUILD_VST=OFF
75-
7673
echo "=== BUILD ==="
7774

7875
MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD)
@@ -83,7 +80,6 @@ MUSE_APP_INSTALL_SUFFIX=$SUFFIX \
8380
MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \
8481
MUSESCORE_REVISION=$MUSESCORE_REVISION \
8582
MUSESCORE_CRASHREPORT_URL=$CRASH_REPORT_URL \
86-
MUSESCORE_BUILD_VST_MODULE=$BUILD_VST \
8783
MUSESCORE_BUILD_CRASHPAD_CLIENT=${MUSESCORE_BUILD_CRASHPAD_CLIENT:-"ON"} \
8884
MUSESCORE_BUILD_UPDATE_MODULE=${MUSESCORE_BUILD_UPDATE_MODULE:-"ON"} \
8985
MUSESCORE_BUILD_WEBSOCKET="ON" \

buildscripts/ci/linux/build_utest.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ done
4242
cat $BUILD_TOOLS/environment.sh
4343
source $BUILD_TOOLS/environment.sh
4444

45-
# TODO: https://github.com/musescore/MuseScore/issues/11689
46-
BUILD_VST=OFF
47-
4845
TESTS_ENABLE_CODE_COVERAGE=OFF
4946
TESTS_COMPILE_USE_UNITY=ON
5047

@@ -64,7 +61,6 @@ MUSESCORE_BUILD_CONFIGURATION=utest \
6461
MUSE_APP_BUILD_MODE=dev \
6562
MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \
6663
MUSESCORE_REVISION=$MUSESCORE_REVISION \
67-
MUSESCORE_BUILD_VST_MODULE=$BUILD_VST \
6864
MUSESCORE_DOWNLOAD_SOUNDFONT=OFF \
6965
MUSESCORE_BUILD_UNIT_TESTS=ON \
7066
MUSESCORE_UNIT_TESTS_ENABLE_CODE_COVERAGE=$TESTS_ENABLE_CODE_COVERAGE \

buildscripts/ci/macos/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ MUSE_APP_BUILD_MODE=$MUSE_APP_BUILD_MODE \
5757
MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \
5858
MUSESCORE_REVISION=$MUSESCORE_REVISION \
5959
MUSESCORE_CRASHREPORT_URL=$CRASH_REPORT_URL \
60-
MUSESCORE_BUILD_VST_MODULE="ON" \
6160
MUSESCORE_BUILD_WEBSOCKET="ON" \
6261
bash ./ninja_build.sh -t install
6362

buildscripts/ci/windows/build.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ SET MUSESCORE_BUILD_NUMBER=%BUILD_NUMBER%
6161
SET MUSESCORE_REVISION=%MUSESCORE_REVISION%
6262
SET MUSESCORE_INSTALL_DIR=%INSTALL_DIR%
6363
SET MUSESCORE_CRASHREPORT_URL="%CRASH_LOG_SERVER_URL%"
64-
SET MUSESCORE_BUILD_VST_MODULE="ON"
6564
SET MUSESCORE_BUILD_WEBSOCKET="ON"
6665

6766
CALL ninja_build.bat -t installrelwithdebinfo || exit \b 1

ninja_build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ MUSESCORE_BUILD_UNIT_TESTS=${MUSESCORE_BUILD_UNIT_TESTS:-"OFF"}
4545
MUSESCORE_ENABLE_CODE_COVERAGE=${MUSESCORE_UNIT_TESTS_ENABLE_CODE_COVERAGE:-"OFF"}
4646
MUSESCORE_NO_RPATH=${MUSESCORE_NO_RPATH:-"OFF"}
4747
MUSESCORE_MODULE_UPDATE=${MUSESCORE_MODULE_UPDATEE:-"ON"}
48-
MUSESCORE_BUILD_VST_MODULE=${MUSESCORE_BUILD_VST_MODULE:-"OFF"}
4948
MUSESCORE_BUILD_VIDEOEXPORT_MODULE=${MUSESCORE_BUILD_VIDEOEXPORT_MODULE:-"OFF"}
5049
MUSESCORE_BUILD_WEBSOCKET=${MUSESCORE_BUILD_WEBSOCKET:-"OFF"}
5150
MUSESCORE_COMPILE_USE_UNITY=${MUSESCORE_COMPILE_USE_UNITY:-"ON"}
@@ -99,7 +98,6 @@ function do_build() {
9998
-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT="${MUSESCORE_BUILD_CRASHPAD_CLIENT}" \
10099
-DMUSE_MODULE_DIAGNOSTICS_CRASHREPORT_URL="${MUSESCORE_CRASHREPORT_URL}" \
101100
-DMUSE_MODULE_GLOBAL_LOGGER_DEBUGLEVEL="${MUSESCORE_DEBUGLEVEL_ENABLED}" \
102-
-DMUSE_MODULE_VST="${MUSESCORE_BUILD_VST_MODULE}" \
103101
-DMUSE_MODULE_NETWORK_WEBSOCKET="${MUSESCORE_BUILD_WEBSOCKET}" \
104102
-DCMAKE_SKIP_RPATH="${MUSESCORE_NO_RPATH}" \
105103
-DMUSE_COMPILE_USE_UNITY="${MUSESCORE_COMPILE_USE_UNITY}"
@@ -176,7 +174,6 @@ case $TARGET in
176174
-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT="${MUSESCORE_BUILD_CRASHPAD_CLIENT}" \
177175
-DMUSE_MODULE_DIAGNOSTICS_CRASHREPORT_URL="${MUSESCORE_CRASHREPORT_URL}" \
178176
-DMUSE_MODULE_GLOBAL_LOGGER_DEBUGLEVEL="${MUSESCORE_DEBUGLEVEL_ENABLED}" \
179-
-DMUSE_MODULE_VST="${MUSESCORE_BUILD_VST_MODULE}" \
180177
-DCMAKE_SKIP_RPATH="${MUSESCORE_NO_RPATH}"
181178
;;
182179

0 commit comments

Comments
 (0)