summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Biro <nurupo.contributions@gmail.com>2017-02-16 05:01:28 -0500
committerMaxim Biro <nurupo.contributions@gmail.com>2018-01-25 15:57:50 -0500
commit5ef37e0b63150ee7fcbfa2d346ab6ae3f3e1305f (patch)
tree9a277215214eeb9d1590e6a41ece5f54fbd4fc80
parent0becafd272997ab1fcbe93ce3d56b27aae6cd80a (diff)
Prefix add_test() with $CROSSCOMPILING_EMULATOR
$CMAKE_CROSSCOMPILING_EMULATOR is automatically prefixing add_test() in CMake versions starting 3.3[1], but because we target CMake 2.8, we can't use that and we have to add our own $CROSSCOMPILING_EMULATOR that will prefix add_test(). [1] https://cmake.org/cmake/help/v3.3/variable/CMAKE_CROSSCOMPILING_EMULATOR.html#variable:CMAKE_CROSSCOMPILING_EMULATOR
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b99510f..4544a91a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -456,7 +456,7 @@ function(auto_test target)
456 toxnetcrypto 456 toxnetcrypto
457 ${CHECK_LIBRARIES}) 457 ${CHECK_LIBRARIES})
458 if(NOT ARGV1 STREQUAL "DONT_RUN") 458 if(NOT ARGV1 STREQUAL "DONT_RUN")
459 add_test(NAME ${target} COMMAND auto_${target}_test) 459 add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test)
460 set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}") 460 set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
461 endif() 461 endif()
462 endif() 462 endif()
@@ -471,7 +471,7 @@ if(BUILD_TOXAV)
471 ${OPUS_LIBRARIES} 471 ${OPUS_LIBRARIES}
472 ${VPX_LIBRARIES} 472 ${VPX_LIBRARIES}
473 ${toxcore_PKGCONFIG_LIBS}) 473 ${toxcore_PKGCONFIG_LIBS})
474 add_test(NAME monolith COMMAND auto_monolith_test) 474 add_test(NAME monolith COMMAND ${CROSSCOMPILING_EMULATOR} auto_monolith_test)
475 475
476 if(ANDROID_CPU_FEATURES) 476 if(ANDROID_CPU_FEATURES)
477 target_compile_definitions(auto_monolith_test PRIVATE -Dtypeof=__typeof__) 477 target_compile_definitions(auto_monolith_test PRIVATE -Dtypeof=__typeof__)