Skip to content

Commit

Permalink
renamed some cmake project options
Browse files Browse the repository at this point in the history
  • Loading branch information
igorkorsukov committed Feb 14, 2023
1 parent f6cd0e1 commit e173d46
Show file tree
Hide file tree
Showing 21 changed files with 84 additions and 137 deletions.
28 changes: 11 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,20 @@ set(CMAKE_MODULE_PATH
###########################################
# Setup option and build settings
###########################################

set(MUSESCORE_REVISION "" CACHE STRING "Build revision")
set(MUSESCORE_BUILD_CONFIG "dev" CACHE STRING "Build config")
# Possible MUSESCORE_BUILD_CONFIG values:
# - dev - for development/nightly builds
# - testing - for testing versions (alpha, beta, RC)
# - release - for stable release builds
set(MUE_BUILD_CONFIGURE "app" CACHE STRING "Build configure")
# Possible MUE_BUILD_CONFIGURE values:
set(MUSESCORE_BUILD_CONFIGURE "app" CACHE STRING "Build configure")
# Possible MUSESCORE_BUILD_CONFIGURE values:
# - app - for desktop app
# - app-portable - for desktop portable app (Windows build for PortableApps.com)
# - app-winstore - for desktop winstore app
# - vtest - for visual tests
# - utest - for unit tests

option(BUILD_MACOS_APPLE_SILICON "Build for Apple Silicon architecture. Only applicable on Macs with Apple Silicon, and requires suitable Qt version." OFF)
option(BUILD_64 "Build 64 bit version of editor" ON)
option(BUILD_AUTOUPDATE "Build with autoupdate support" OFF)
set(MUSESCORE_BUILD_MODE "dev" CACHE STRING "Build mode")
# Possible MUSESCORE_BUILD_MODE values:
# - dev - for development/nightly builds
# - testing - for testing versions (alpha, beta, RC)
# - release - for stable release builds

set(MUSESCORE_REVISION "" CACHE STRING "Build revision")

# Modules framework (alphabetical order please)
option(MUE_BUILD_ACCESSIBILITY_MODULE "Build accessibility module" ON) # not impl
Expand Down Expand Up @@ -107,6 +103,8 @@ option(MUE_CRASHPAD_HANDLER_PATH "Path to custom crashpad_handler executable (op
option(MUE_ENABLE_CUSTOM_ALLOCATOR "Enable custom allocator (used for engraving)" OFF)

# === Compile ===
option(MUE_COMPILE_BUILD_64 "Build 64 bit version of editor" ON)
option(MUE_COMPILE_BUILD_MACOS_APPLE_SILICON "Build for Apple Silicon architecture. Only applicable on Macs with Apple Silicon, and requires suitable Qt version." OFF)
option(MUE_COMPILE_USE_PCH "Use precompiled headers." ON)
option(MUE_COMPILE_USE_UNITY "Use unity build." ON)
option(MUE_COMPILE_USE_CCACHE "Try use ccache" ON)
Expand Down Expand Up @@ -173,10 +171,6 @@ include(SetupFreetype)

include(FindSndFile)

if (BUILD_AUTOUPDATE)
include(SetupSparkle)
endif(BUILD_AUTOUPDATE)

if (MUE_DOWNLOAD_SOUNDFONT)
include(DownloadSoundFont)
endif(MUE_DOWNLOAD_SOUNDFONT)
Expand Down
8 changes: 2 additions & 6 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@
"value": "RELWITHDEBINFO"
},
{
"name": "BUILD_FOR_WINSTORE",
"value": "OFF"
},
{
"name": "BUILD_64",
"name": "MUE_COMPILE_BUILD_64",
"value": "ON"
},
{
Expand All @@ -35,4 +31,4 @@
"ctestCommandArgs": ""
}
]
}
}
15 changes: 9 additions & 6 deletions SetupConfigure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@

include(GetBuildType)

message(STATUS "Build configure: ${MUE_BUILD_CONFIGURE}")
string(TOUPPER ${MUE_BUILD_CONFIGURE} _MUE_BUILD_CONFIGURE)
message(STATUS "Build configure: ${MUSESCORE_BUILD_CONFIGURE}")
message(STATUS "Build mode: ${MUSESCORE_BUILD_MODE}")

string(TOUPPER ${MUSESCORE_BUILD_CONFIGURE} BUILD_CONFIGURE)

###########################################
# General
Expand Down Expand Up @@ -49,11 +51,11 @@ endif()
# Desktop App
###########################################
set(MUE_GENERAL_APP OFF)
if(_MUE_BUILD_CONFIGURE MATCHES "APP")
if(BUILD_CONFIGURE MATCHES "APP")
set(MUE_GENERAL_APP ON)
endif()

if(_MUE_BUILD_CONFIGURE MATCHES "APP-PORTABLE")
if(BUILD_CONFIGURE MATCHES "APP-PORTABLE")
set(MUE_GENERAL_APP ON)
set(WIN_PORTABLE ON)
endif()
Expand All @@ -75,7 +77,7 @@ endif()
###########################################
# VTest
###########################################
if(_MUE_BUILD_CONFIGURE MATCHES "VTEST")
if(BUILD_CONFIGURE MATCHES "VTEST")
set(MUE_BUILD_AUDIO_MODULE OFF)
set(MUE_BUILD_MUSESAMPLER_MODULE OFF)
set(MUE_BUILD_NETWORK_MODULE OFF)
Expand All @@ -102,7 +104,7 @@ endif()
###########################################
# UTest
###########################################
if(_MUE_BUILD_CONFIGURE MATCHES "UTEST")
if(BUILD_CONFIGURE MATCHES "UTEST")
set(MUE_BUILD_UNIT_TESTS ON)
set(MUE_ENABLE_LOGGER_DEBUGLEVEL ON)
endif()
Expand Down Expand Up @@ -151,6 +153,7 @@ if (WIN_PORTABLE)
add_definitions(-DWIN_PORTABLE)
endif()

add_definitions(-DMUSESCORE_REVISION="${MUSESCORE_REVISION}")
add_definitions(-DHAW_PROFILER_ENABLED)

if (MUE_ENABLE_LOAD_QML_FROM_SOURCE)
Expand Down
4 changes: 2 additions & 2 deletions build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ list(APPEND CONFIGURE_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_PATH}")
list(APPEND CONFIGURE_ARGS "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}")

if(QT_COMPILER MATCHES "_64$" OR QT_COMPILER MATCHES "mingw64")
list(APPEND CONFIGURE_ARGS "-DBUILD_64=ON")
list(APPEND CONFIGURE_ARGS "-DMUE_COMPILE_BUILD_64=ON")
else()
list(APPEND CONFIGURE_ARGS "-DBUILD_64=OFF")
list(APPEND CONFIGURE_ARGS "-DMUE_COMPILE_BUILD_64=OFF")
endif()

#### ACTUAL BUILD STEPS START HERE ####
Expand Down
14 changes: 7 additions & 7 deletions build/ci/backend/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ done
if [ -z "$BUILD_NUMBER" ]; then echo "error: not set BUILD_NUMBER"; exit 1; fi
if [ -z "$BUILD_MODE" ]; then BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env); fi

MUSESCORE_BUILD_CONFIG=dev
MUSESCORE_BUILD_MODE=dev

case "${BUILD_MODE}" in
"devel_build") MUSESCORE_BUILD_CONFIG=dev;;
"testing_build") MUSESCORE_BUILD_CONFIG=testing;;
"stable_build") MUSESCORE_BUILD_CONFIG=release;;
"devel_build") MUSESCORE_BUILD_MODE=dev;;
"testing_build") MUSESCORE_BUILD_MODE=testing;;
"stable_build") MUSESCORE_BUILD_MODE=release;;
esac

echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG"
echo "MUSESCORE_BUILD_MODE: $MUSESCORE_BUILD_MODE"
echo "BUILD_NUMBER: $BUILD_NUMBER"
echo "BUILD_MODE: $BUILD_MODE"
echo "BUILD_VIDEOEXPORT: $BUILD_VIDEOEXPORT"
Expand All @@ -66,14 +66,14 @@ echo "=== BUILD ==="
MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD)

# Build
MUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG \
MUSESCORE_BUILD_MODE=$MUSESCORE_BUILD_MODE \
MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \
MUSESCORE_REVISION=$MUSESCORE_REVISION \
MUSESCORE_BUILD_VIDEOEXPORT_MODULE=$BUILD_VIDEOEXPORT \
bash ./ninja_build.sh -t appimage


bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_CONFIG
bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_MODE
bash ./build/ci/tools/make_version_env.sh $BUILD_NUMBER
bash ./build/ci/tools/make_revision_env.sh $MUSESCORE_REVISION
bash ./build/ci/tools/make_branch_env.sh
Expand Down
18 changes: 9 additions & 9 deletions build/ci/linux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@ if [ -z "$BUILD_NUMBER" ]; then echo "error: not set BUILD_NUMBER"; exit 1; fi
if [ -z "$BUILD_MODE" ]; then BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env); fi
if [ -z "$YOUTUBE_API_KEY" ]; then YOUTUBE_API_KEY=""; fi

MUSESCORE_BUILD_CONFIG=dev
MUSESCORE_BUILD_MODE=dev

case "${BUILD_MODE}" in
"devel_build") MUSESCORE_BUILD_CONFIG=dev; SUFFIX=dev;;
"nightly_build") MUSESCORE_BUILD_CONFIG=dev; SUFFIX=nightly;;
"testing_build") MUSESCORE_BUILD_CONFIG=testing; SUFFIX=testing;;
"stable_build") MUSESCORE_BUILD_CONFIG=release; SUFFIX="";;
"mtests") MUSESCORE_BUILD_CONFIG=dev; BUILDTYPE=installdebug; OPTIONS="USE_SYSTEM_FREETYPE=ON UPDATE_CACHE=FALSE PREFIX=$ARTIFACTS_DIR/software";;
"devel_build") MUSESCORE_BUILD_MODE=dev; SUFFIX=dev;;
"nightly_build") MUSESCORE_BUILD_MODE=dev; SUFFIX=nightly;;
"testing_build") MUSESCORE_BUILD_MODE=testing; SUFFIX=testing;;
"stable_build") MUSESCORE_BUILD_MODE=release; SUFFIX="";;
"mtests") MUSESCORE_BUILD_MODE=dev; BUILDTYPE=installdebug; OPTIONS="USE_SYSTEM_FREETYPE=ON UPDATE_CACHE=FALSE PREFIX=$ARTIFACTS_DIR/software";;
esac

echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG"
echo "MUSESCORE_BUILD_MODE: $MUSESCORE_BUILD_MODE"
echo "BUILD_NUMBER: $BUILD_NUMBER"
echo "CRASH_REPORT_URL: $CRASH_REPORT_URL"
echo "BUILD_MODE: $BUILD_MODE"
Expand Down Expand Up @@ -89,7 +89,7 @@ echo "=== BUILD ==="
MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD)

# Build portable AppImage
MUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG \
MUSESCORE_BUILD_MODE=$MUSESCORE_BUILD_MODE \
MUSESCORE_INSTALL_SUFFIX=$SUFFIX \
MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \
MUSESCORE_REVISION=$MUSESCORE_REVISION \
Expand All @@ -102,7 +102,7 @@ MUSESCORE_BUILD_UPDATE_MODULE=${MUSESCORE_BUILD_UPDATE_MODULE:-"ON"} \
bash ./ninja_build.sh -t appimage


bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_CONFIG
bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_MODE
bash ./build/ci/tools/make_version_env.sh $BUILD_NUMBER
bash ./build/ci/tools/make_revision_env.sh $MUSESCORE_REVISION
bash ./build/ci/tools/make_branch_env.sh
Expand Down
2 changes: 1 addition & 1 deletion build/ci/linux/build_utest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ echo "=== BUILD ==="

MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD)

MUSESCORE_BUILD_CONFIG=dev \
MUSESCORE_BUILD_MODE=dev \
MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \
MUSESCORE_REVISION=$MUSESCORE_REVISION \
MUSESCORE_BUILD_VST_MODULE=$BUILD_VST \
Expand Down
16 changes: 8 additions & 8 deletions build/ci/macos/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ if [ -z "$BUILD_NUMBER" ]; then echo "error: not set BUILD_NUMBER"; exit 1; fi
if [ -z "$YOUTUBE_API_KEY" ]; then YOUTUBE_API_KEY=""; fi

BUILD_MODE=$(cat $ARTIFACTS_DIR/env/build_mode.env)
MUSESCORE_BUILD_CONFIG=dev
if [ "$BUILD_MODE" == "devel_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi
if [ "$BUILD_MODE" == "nightly_build" ]; then MUSESCORE_BUILD_CONFIG=dev; fi
if [ "$BUILD_MODE" == "testing_build" ]; then MUSESCORE_BUILD_CONFIG=testing; fi
if [ "$BUILD_MODE" == "stable_build" ]; then MUSESCORE_BUILD_CONFIG=release; fi
MUSESCORE_BUILD_MODE=dev
if [ "$BUILD_MODE" == "devel_build" ]; then MUSESCORE_BUILD_MODE=dev; fi
if [ "$BUILD_MODE" == "nightly_build" ]; then MUSESCORE_BUILD_MODE=dev; fi
if [ "$BUILD_MODE" == "testing_build" ]; then MUSESCORE_BUILD_MODE=testing; fi
if [ "$BUILD_MODE" == "stable_build" ]; then MUSESCORE_BUILD_MODE=release; fi

if [ -z "$VST3_SDK_PATH" ]; then
echo "warning: not set VST3_SDK_PATH, build VST module disabled"
Expand All @@ -54,7 +54,7 @@ else
BUILD_VST=ON
fi

echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG"
echo "MUSESCORE_BUILD_MODE: $MUSESCORE_BUILD_MODE"
echo "BUILD_NUMBER: $BUILD_NUMBER"
echo "CRASH_REPORT_URL: $CRASH_REPORT_URL"
echo "VST3_SDK_PATH: $VST3_SDK_PATH"
Expand All @@ -63,7 +63,7 @@ echo "YOUTUBE_API_KEY: $YOUTUBE_API_KEY"
MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD)

MUSESCORE_INSTALL_DIR="../applebuild" \
MUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG \
MUSESCORE_BUILD_MODE=$MUSESCORE_BUILD_MODE \
MUSESCORE_BUILD_NUMBER=$BUILD_NUMBER \
MUSESCORE_REVISION=$MUSESCORE_REVISION \
MUSESCORE_CRASHREPORT_URL=$CRASH_REPORT_URL \
Expand All @@ -72,7 +72,7 @@ MUSESCORE_VST3_SDK_PATH=$VST3_SDK_PATH \
MUSESCORE_YOUTUBE_API_KEY=$YOUTUBE_API_KEY \
bash ./ninja_build.sh -t install

bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_CONFIG
bash ./build/ci/tools/make_release_channel_env.sh -c $MUSESCORE_BUILD_MODE
bash ./build/ci/tools/make_version_env.sh $BUILD_NUMBER
bash ./build/ci/tools/make_revision_env.sh $MUSESCORE_REVISION
bash ./build/ci/tools/make_branch_env.sh
12 changes: 6 additions & 6 deletions build/ci/tools/make_release_channel_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
ARTIFACTS_DIR=build.artifacts
MUSESCORE_BUILD_CONFIG=dev
MUSESCORE_BUILD_MODE=dev

while [[ "$#" -gt 0 ]]; do
case $1 in
-c|--build_config) MUSESCORE_BUILD_CONFIG="$2"; shift ;;
-c|--build-mode) MUSESCORE_BUILD_MODE="$2"; shift ;;
*) echo "Unknown parameter passed: $1"; exit 1 ;;
esac
shift
done

if [ -z "$MUSESCORE_BUILD_CONFIG" ]; then echo "error: not set MUSESCORE_BUILD_CONFIG"; exit 1; fi
if [ -z "$MUSESCORE_BUILD_MODE" ]; then echo "error: not set MUSESCORE_BUILD_MODE"; exit 1; fi

echo "MUSESCORE_BUILD_CONFIG: $MUSESCORE_BUILD_CONFIG"
echo "MUSESCORE_BUILD_MODE: $MUSESCORE_BUILD_MODE"

export MSCORE_RELEASE_CHANNEL=$(cmake -DMUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG -P config.cmake | sed -n -e 's/^.*MSCORE_RELEASE_CHANNEL *//p')
export MSCORE_RELEASE_CHANNEL=$(cmake -DMUSESCORE_BUILD_MODE=$MUSESCORE_BUILD_MODE -P config.cmake | sed -n -e 's/^.*MSCORE_RELEASE_CHANNEL *//p')

echo ${MSCORE_RELEASE_CHANNEL} > $ARTIFACTS_DIR/env/release_channel.env
cat $ARTIFACTS_DIR/env/release_channel.env
cat $ARTIFACTS_DIR/env/release_channel.env
16 changes: 8 additions & 8 deletions build/ci/windows/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ IF NOT %TARGET_PROCESSOR_BITS% == 64 (
)

SET /p BUILD_MODE=<%ARTIFACTS_DIR%\env\build_mode.env
SET "MUSESCORE_BUILD_CONFIG=dev"
IF %BUILD_MODE% == devel_build ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE (
IF %BUILD_MODE% == nightly_build ( SET "MUSESCORE_BUILD_CONFIG=dev" ) ELSE (
IF %BUILD_MODE% == testing_build ( SET "MUSESCORE_BUILD_CONFIG=testing" ) ELSE (
IF %BUILD_MODE% == stable_build ( SET "MUSESCORE_BUILD_CONFIG=release" ) ELSE (
SET "MUSESCORE_BUILD_MODE=dev"
IF %BUILD_MODE% == devel_build ( SET "MUSESCORE_BUILD_MODE=dev" ) ELSE (
IF %BUILD_MODE% == nightly_build ( SET "MUSESCORE_BUILD_MODE=dev" ) ELSE (
IF %BUILD_MODE% == testing_build ( SET "MUSESCORE_BUILD_MODE=testing" ) ELSE (
IF %BUILD_MODE% == stable_build ( SET "MUSESCORE_BUILD_MODE=release" ) ELSE (
ECHO "error: unknown BUILD_MODE: %BUILD_MODE%"
EXIT /b 1
))))

ECHO "MUSESCORE_BUILD_CONFIG: %MUSESCORE_BUILD_CONFIG%"
ECHO "MUSESCORE_BUILD_MODE: %MUSESCORE_BUILD_MODE%"
ECHO "BUILD_NUMBER: %BUILD_NUMBER%"
ECHO "TARGET_PROCESSOR_BITS: %TARGET_PROCESSOR_BITS%"
ECHO "CRASH_LOG_SERVER_URL: %CRASH_LOG_SERVER_URL%"
Expand All @@ -63,8 +63,8 @@ IF %BUILD_WIN_PORTABLE% == ON (
bash ./build/ci/tools/make_revision_env.sh
SET /p MUSESCORE_REVISION=<%ARTIFACTS_DIR%\env\build_revision.env

SET MUSESCORE_BUILD_CONFIG=%MUSESCORE_BUILD_CONFIG%
SET MUSESCORE_BUILD_CONFIGURE=%MUSESCORE_BUILD_CONFIGURE%
SET MUSESCORE_BUILD_MODE=%MUSESCORE_BUILD_MODE%
SET MUSESCORE_BUILD_NUMBER=%BUILD_NUMBER%
SET MUSESCORE_REVISION=%MUSESCORE_REVISION%
SET MUSESCORE_INSTALL_DIR=%INSTALL_DIR%
Expand All @@ -75,6 +75,6 @@ SET MUSESCORE_YOUTUBE_API_KEY=%YOUTUBE_API_KEY%

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

bash ./build/ci/tools/make_release_channel_env.sh -c %MUSESCORE_BUILD_CONFIG%
bash ./build/ci/tools/make_release_channel_env.sh -c %MUSESCORE_BUILD_MODE%
bash ./build/ci/tools/make_version_env.sh %BUILD_NUMBER%
bash ./build/ci/tools/make_branch_env.sh
6 changes: 3 additions & 3 deletions build/cmake/SetupBuildEnvironment.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ elseif(CC_IS_MINGW)

# -mno-ms-bitfields see #22048
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
if (NOT BUILD_64)
if (NOT MUE_COMPILE_BUILD_64)
set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
endif (NOT BUILD_64)
endif()

add_definitions(-D_UNICODE)
add_definitions(-DUNICODE)
Expand Down Expand Up @@ -119,7 +119,7 @@ endif()

# APPLE specific
if (OS_IS_MAC)
if (BUILD_MACOS_APPLE_SILICON)
if (MUE_COMPILE_BUILD_MACOS_APPLE_SILICON)
set(CMAKE_OSX_ARCHITECTURES ) # leave empty, use default
else()
set(CMAKE_OSX_ARCHITECTURES x86_64)
Expand Down
6 changes: 3 additions & 3 deletions build/cmake/SetupDependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/GetPlatformInfo.cmake)

if (OS_IS_WIN)

if (BUILD_64)
if (MUE_COMPILE_BUILD_64)
set(DEPENDENCIES_DIR "${PROJECT_SOURCE_DIR}/dependencies/libx64")
else (BUILD_64)
else()
set(DEPENDENCIES_DIR "${PROJECT_SOURCE_DIR}/dependencies/libx86")
endif (BUILD_64)
endif()

link_directories(${DEPENDENCIES_DIR})

Expand Down
2 changes: 1 addition & 1 deletion build/cmake/TryUseLocalRevision.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ if (MUSESCORE_REVISION STREQUAL "")
file(READ "${PROJECT_SOURCE_DIR}/local_build_revision.env" MUSESCORE_REVISION)
STRING(REGEX REPLACE "\n" "" MUSESCORE_REVISION "${MUSESCORE_REVISION}")
endif()
endif(MUSESCORE_REVISION STREQUAL "")
endif()
2 changes: 1 addition & 1 deletion build/cmake_wrapper.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set "TARGET_PROCESSOR_BITS=64"
:loop
rem CMD splits arguments on equals sign, so -DFOO=BAR is treated as -DFOO and BAR
if "%~1%~2" == "" goto continue
if "%~1=%~2" == "-DBUILD_64=OFF" set "TARGET_PROCESSOR_BITS=32"
if "%~1=%~2" == "-DMUE_COMPILE_BUILD_64=OFF" set "TARGET_PROCESSOR_BITS=32"
shift
goto loop
:continue
Expand Down
Loading

0 comments on commit e173d46

Please sign in to comment.