diff options
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dee41abc..5e904a53f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,8 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON option(ENABLE_QT "Enable the Qt frontend" ON) CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" ON "ENABLE_SDL2;MSVC" OFF) +option(YUZU_USE_BUNDLED_UNICORN "Build/Download bundled Unicorn" ON) + if(NOT EXISTS ${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit) message(STATUS "Copying pre-commit hook") file(COPY hooks/pre-commit @@ -209,8 +211,7 @@ else() endif() # If unicorn isn't found, msvc -> download bundled unicorn; everyone else -> build external -find_package(Unicorn QUIET) -if (NOT UNICORN_FOUND) +if (YUZU_USE_BUNDLED_UNICORN) if (MSVC) message(STATUS "unicorn not found, falling back to bundled") # Detect toolchain and platform @@ -249,7 +250,7 @@ if (NOT UNICORN_FOUND) find_package(PythonInterp 2.7 REQUIRED) add_custom_command(OUTPUT ${LIBUNICORN_LIBRARY} - COMMAND ${CMAKE_COMMAND} -E env UNICORN_ARCHS="aarch64" PYTHON="${PYTHON_EXECUTABLE}" /bin/sh make.sh + COMMAND ${CMAKE_COMMAND} -E env UNICORN_ARCHS="aarch64" PYTHON="${PYTHON_EXECUTABLE}" /bin/sh make.sh macos-universal-no WORKING_DIRECTORY ${UNICORN_PREFIX} ) # ALL makes this custom target build every time @@ -259,6 +260,8 @@ if (NOT UNICORN_FOUND) ) unset(UNICORN_LIB_NAME) endif() +else() + find_package(Unicorn REQUIRED) endif() if (UNICORN_FOUND) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 1af80769a..d132ab969 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -17,7 +17,7 @@ if ($ENV{CI}) string(SUBSTRING ${WORD} 1 -1 REMAINDER) string(TOUPPER ${FIRST_LETTER} FIRST_LETTER) # this leaves a trailing space on the last word, but we actually want that - # because of how its styled in the title bar. + # because of how it's styled in the title bar. set(REPO_NAME "${REPO_NAME}${FIRST_LETTER}${REMAINDER} ") endforeach() endif() |