← Back to branch summary

~kgunn72/mir/dont-crash-when-shooting-invalid-surface

« back to all changes in this revision

Viewing changes to tests/acceptance-tests/CMakeLists.txt

  • Committer: Tarmac
  • Author(s): Alan Griffiths, Alexandros Frantzis, Daniel van Vugt, Kevin DuBois, Christopher James Halse Rogers, chris.gagnon, Mathieu Trudel-Lapierre, Robert Carr, Automatic PS uploader, Kevin Gunn, Daniel d'Andrada, Christopher James Halse Rogers, Michael Terry, Brandon Schaefer, Timo Jyrinki, Mir Team, Andreas Pokorny
  • Date: 2013-12-20 11:11:22 UTC
  • mfrom: (1169.1.1 version-0.1.3)
  • Revision ID: tarmac-20131220111122-h503fd1fnq7pn9za
Latest upstream release: Mir 0.1.3 (r1298).

Approved by Alan Griffiths, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/acceptance-tests/CMakeLists.txt
28
28
)
29
29
 
30
30
add_executable(
31
 
  acceptance-tests
 
31
  mir_acceptance_tests
32
32
 
33
33
  ${SOURCES}
34
34
)
35
 
uses_android_input(acceptance-tests)
 
35
uses_android_input(mir_acceptance_tests)
36
36
 
37
37
 
38
38
target_link_libraries(
39
 
  acceptance-tests
 
39
  mir_acceptance_tests
40
40
 
41
41
  mirserver
42
42
  mirclient
56
56
  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
57
57
)
58
58
 
59
 
mir_discover_tests(acceptance-tests)
 
59
if (MIR_PLATFORM STREQUAL "android")
 
60
    #don't discover the test, we'll run it later on a phone
 
61
else()
 
62
    if(MIR_ENABLE_ACCEPTANCE_TESTS)
 
63
    mir_discover_tests(mir_acceptance_tests)
 
64
  endif()
 
65
endif()
 
66
 
 
67
install(
 
68
    TARGETS mir_acceptance_tests
 
69
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 
70
)