ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5369 from ligfx/cmakegtestnosystem 

CMake: don't look for shared Google Test
This commit is contained in:
Matthew Parlane 2017-05-04 13:24:10 +12:00 committed by GitHub
parent f3052b7a15 cd7af32e0b
commit d20bb985ad
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -13,7 +13,6 @@ project(dolphin-emu)
option(USE_EGL "Enables EGL OpenGL Interface" OFF)
option(TRY_X11 "Enables X11 Support" ON)
option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
option(USE_SHARED_GTEST "Use shared gtest library if found" OFF)
option(USE_UPNP "Enables UPnP port mapping support" ON)
option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF)
option(ENABLE_QT2 "Enable Qt2 (use the other experimental Qt interface)" OFF)
@ -804,15 +803,8 @@ include_directories("${PROJECT_BINARY_DIR}/Source/Core")
########################################
# Unit testing.
#
find_package(GTest)
if(GTEST_FOUND AND USE_SHARED_GTEST)
message(STATUS "Using shared gtest")
include_directories(${GTEST_INCLUDE_DIRS})
else()
message(STATUS "Using static gtest from Externals")
include_directories(Externals/gtest/include)
add_subdirectory(Externals/gtest EXCLUDE_FROM_ALL)
endif()
message(STATUS "Using static gtest from Externals")
add_subdirectory(Externals/gtest EXCLUDE_FROM_ALL)
enable_testing()
add_custom_target(unittests)