piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Android: Update the gradle file to use android studio 2.2 cmake.

Browse Source
This commit is contained in:
degasus
2016-06-08 19:49:46 +02:00
parent abb5a64919
commit 05eff01229
14 changed files with 59 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/UnitTests/CMakeLists.txt
View File

@ -5,6 +5,7 @@ endif()
if(ANDROID)
set(LIBS ${LIBS} android log)
endif()
file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests)
macro(add_dolphin_test target srcs)
# Since this is a Core dependency, it can't be linked as a library and has
# to be linked as an object file. Otherwise CMake inserts the library after
@ -13,9 +14,6 @@ macro(add_dolphin_test target srcs)
set(srcs2 ${srcs} ${CMAKE_SOURCE_DIR}/Source/UnitTests/TestUtils/StubHost.cpp)
add_executable(Test_${target} EXCLUDE_FROM_ALL ${srcs2})
set_target_properties(Test_${target} PROPERTIES OUTPUT_NAME Tests/${target})
add_custom_command(TARGET Test_${target}
PRE_LINK
COMMAND mkdir -p ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests)
target_link_libraries(Test_${target} ${LIBS})
add_dependencies(unittests Test_${target})
add_test(NAME ${target} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests/${target})