Merge pull request #7613 from orbea/unittests

cmake: Conditionally build the unit tests.
This commit is contained in:
Léo Lam 2019-01-16 21:36:04 +01:00 committed by GitHub
commit 8d601b1466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions

View File

@ -32,6 +32,7 @@ option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
option(ENABLE_ALSA "Enables ALSA sound backend" ON) option(ENABLE_ALSA "Enables ALSA sound backend" ON)
option(ENABLE_PULSEAUDIO "Enables PulseAudio sound backend" ON) option(ENABLE_PULSEAUDIO "Enables PulseAudio sound backend" ON)
option(ENABLE_LLVM "Enables LLVM support, for disassembly" ON) option(ENABLE_LLVM "Enables LLVM support, for disassembly" ON)
option(ENABLE_TESTS "Enables building the unit tests" ON)
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence, show the current game on Discord" ON) option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence, show the current game on Discord" ON)
# Maintainers: if you consider blanket disabling this for your users, please # Maintainers: if you consider blanket disabling this for your users, please
@ -720,8 +721,12 @@ include_directories("${PROJECT_BINARY_DIR}/Source/Core")
######################################## ########################################
# Unit testing. # Unit testing.
# #
message(STATUS "Using static gtest from Externals") if(ENABLE_TESTS)
add_subdirectory(Externals/gtest EXCLUDE_FROM_ALL) message(STATUS "Using static gtest from Externals")
add_subdirectory(Externals/gtest EXCLUDE_FROM_ALL)
else()
message(STATUS "Unit tests are disabled")
endif()
######################################## ########################################
# Process Dolphin source now that all setup is complete # Process Dolphin source now that all setup is complete

View File

@ -39,7 +39,10 @@ add_subdirectory(Core)
if (ANDROID) if (ANDROID)
add_subdirectory(Android/jni) add_subdirectory(Android/jni)
endif() endif()
add_subdirectory(UnitTests)
if (ENABLE_TESTS)
add_subdirectory(UnitTests)
endif()
if (DSPTOOL) if (DSPTOOL)
add_subdirectory(DSPTool) add_subdirectory(DSPTool)