etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CMakeLists: Do not look for system Unicorn by default

Browse source 
Since we use a custom build of unicorn it doesn't make much sense to look for
the system version, unless the user explicitly wants to override this.
This commit is contained in:
MerryMage 2018-01-21 13:29:05 +00:00
parent d904b0db58
commit bba785d643
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -15,6 +15,8 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON
option(ENABLE_QT "Enable the Qt frontend" 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) 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) if(NOT EXISTS ${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit)
message(STATUS "Copying pre-commit hook") message(STATUS "Copying pre-commit hook")
file(COPY hooks/pre-commit file(COPY hooks/pre-commit
@ -209,8 +211,7 @@ else()
endif() endif()
# If unicorn isn't found, msvc -> download bundled unicorn; everyone else -> build external # If unicorn isn't found, msvc -> download bundled unicorn; everyone else -> build external
find_package(Unicorn QUIET) if (YUZU_USE_BUNDLED_UNICORN)
if (NOT UNICORN_FOUND)
if (MSVC) if (MSVC)
message(STATUS "unicorn not found, falling back to bundled") message(STATUS "unicorn not found, falling back to bundled")
# Detect toolchain and platform # Detect toolchain and platform
@ -259,6 +260,8 @@ if (NOT UNICORN_FOUND)
) )
unset(UNICORN_LIB_NAME) unset(UNICORN_LIB_NAME)
endif() endif()
else()
find_package(Unicorn REQUIRED)
endif() endif()
if (UNICORN_FOUND) if (UNICORN_FOUND)