Use full syntax for ADD_TEST CMake command (#107)

Make possible to cross-run tests with CMAKE_CROSSCOMPILING_EMULATOR

1 files changed, 85 insertions, 85 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a58616..d7e1786 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -349,406 +349,406 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_TESTS)
     ADD_EXECUTABLE(atm7029b-tablet-test test/mock/atm7029b-tablet.cc)
     TARGET_INCLUDE_DIRECTORIES(atm7029b-tablet-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(atm7029b-tablet-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(atm7029b-tablet-test atm7029b-tablet-test)
+    ADD_TEST(NAME atm7029b-tablet-test COMMAND atm7029b-tablet-test)
 
     ADD_EXECUTABLE(blu-r1-hd-test test/mock/blu-r1-hd.cc)
     TARGET_INCLUDE_DIRECTORIES(blu-r1-hd-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(blu-r1-hd-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(blu-r1-hd-test blu-r1-hd-test)
+    ADD_TEST(NAME blu-r1-hd-test COMMAND blu-r1-hd-test)
 
     ADD_EXECUTABLE(galaxy-a3-2016-eu-test test/mock/galaxy-a3-2016-eu.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-a3-2016-eu-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-a3-2016-eu-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-a3-2016-eu-test galaxy-a3-2016-eu-test)
+    ADD_TEST(NAME galaxy-a3-2016-eu-test COMMAND galaxy-a3-2016-eu-test)
 
     ADD_EXECUTABLE(galaxy-a8-2016-duos-test test/mock/galaxy-a8-2016-duos.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-a8-2016-duos-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-a8-2016-duos-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-a8-2016-duos-test galaxy-a8-2016-duos-test)
+    ADD_TEST(NAME galaxy-a8-2016-duos-test COMMAND galaxy-a8-2016-duos-test)
 
     ADD_EXECUTABLE(galaxy-grand-prime-value-edition-test test/mock/galaxy-grand-prime-value-edition.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-grand-prime-value-edition-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-grand-prime-value-edition-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-grand-prime-value-edition-test galaxy-grand-prime-value-edition-test)
+    ADD_TEST(NAME galaxy-grand-prime-value-edition-test COMMAND galaxy-grand-prime-value-edition-test)
 
     ADD_EXECUTABLE(galaxy-j1-2016-test test/mock/galaxy-j1-2016.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-j1-2016-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-j1-2016-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-j1-2016-test galaxy-j1-2016-test)
+    ADD_TEST(NAME galaxy-j1-2016-test COMMAND galaxy-j1-2016-test)
 
     ADD_EXECUTABLE(galaxy-j5-test test/mock/galaxy-j5.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-j5-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-j5-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-j5-test galaxy-j5-test)
+    ADD_TEST(NAME galaxy-j5-test COMMAND galaxy-j5-test)
 
     ADD_EXECUTABLE(galaxy-j7-prime-test test/mock/galaxy-j7-prime.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-j7-prime-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-j7-prime-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-j7-prime-test galaxy-j7-prime-test)
+    ADD_TEST(NAME galaxy-j7-prime-test COMMAND galaxy-j7-prime-test)
 
     ADD_EXECUTABLE(galaxy-j7-tmobile-test test/mock/galaxy-j7-tmobile.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-j7-tmobile-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-j7-tmobile-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-j7-tmobile-test galaxy-j7-tmobile-test)
+    ADD_TEST(NAME galaxy-j7-tmobile-test COMMAND galaxy-j7-tmobile-test)
 
     ADD_EXECUTABLE(galaxy-j7-uae-test test/mock/galaxy-j7-uae.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-j7-uae-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-j7-uae-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-j7-uae-test galaxy-j7-uae-test)
+    ADD_TEST(NAME galaxy-j7-uae-test COMMAND galaxy-j7-uae-test)
 
     ADD_EXECUTABLE(galaxy-s3-us-test test/mock/galaxy-s3-us.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s3-us-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s3-us-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s3-us-test galaxy-s3-us-test)
+    ADD_TEST(NAME galaxy-s3-us-test COMMAND galaxy-s3-us-test)
 
     ADD_EXECUTABLE(galaxy-s4-us-test test/mock/galaxy-s4-us.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s4-us-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s4-us-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s4-us-test galaxy-s4-us-test)
+    ADD_TEST(NAME galaxy-s4-us-test COMMAND galaxy-s4-us-test)
 
     ADD_EXECUTABLE(galaxy-s5-global-test test/mock/galaxy-s5-global.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s5-global-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s5-global-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s5-global-test galaxy-s5-global-test)
+    ADD_TEST(NAME galaxy-s5-global-test COMMAND galaxy-s5-global-test)
 
     ADD_EXECUTABLE(galaxy-s5-us-test test/mock/galaxy-s5-us.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s5-us-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s5-us-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s5-us-test galaxy-s5-us-test)
+    ADD_TEST(NAME galaxy-s5-us-test COMMAND galaxy-s5-us-test)
 
     ADD_EXECUTABLE(galaxy-tab-3-7.0-test test/mock/galaxy-tab-3-7.0.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-tab-3-7.0-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-tab-3-7.0-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-tab-3-7.0-test galaxy-tab-3-7.0-test)
+    ADD_TEST(NAME galaxy-tab-3-7.0-test COMMAND galaxy-tab-3-7.0-test)
 
     ADD_EXECUTABLE(galaxy-tab-3-lite-test test/mock/galaxy-tab-3-lite.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-tab-3-lite-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-tab-3-lite-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-tab-3-lite-test galaxy-tab-3-lite-test)
+    ADD_TEST(NAME galaxy-tab-3-lite-test COMMAND galaxy-tab-3-lite-test)
 
     ADD_EXECUTABLE(galaxy-win-duos-test test/mock/galaxy-win-duos.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-win-duos-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-win-duos-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-win-duos-test galaxy-win-duos-test)
+    ADD_TEST(NAME galaxy-win-duos-test COMMAND galaxy-win-duos-test)
 
     ADD_EXECUTABLE(huawei-ascend-p7-test test/mock/huawei-ascend-p7.cc)
     TARGET_INCLUDE_DIRECTORIES(huawei-ascend-p7-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(huawei-ascend-p7-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(huawei-ascend-p7-test huawei-ascend-p7-test)
+    ADD_TEST(NAME huawei-ascend-p7-test COMMAND huawei-ascend-p7-test)
 
     ADD_EXECUTABLE(huawei-honor-6-test test/mock/huawei-honor-6.cc)
     TARGET_INCLUDE_DIRECTORIES(huawei-honor-6-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(huawei-honor-6-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(huawei-honor-6-test huawei-honor-6-test)
+    ADD_TEST(NAME huawei-honor-6-test COMMAND huawei-honor-6-test)
 
     ADD_EXECUTABLE(lenovo-a6600-plus-test test/mock/lenovo-a6600-plus.cc)
     TARGET_INCLUDE_DIRECTORIES(lenovo-a6600-plus-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(lenovo-a6600-plus-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(lenovo-a6600-plus-test lenovo-a6600-plus-test)
+    ADD_TEST(NAME lenovo-a6600-plus-test COMMAND lenovo-a6600-plus-test)
 
     ADD_EXECUTABLE(lenovo-vibe-x2-test test/mock/lenovo-vibe-x2.cc)
     TARGET_INCLUDE_DIRECTORIES(lenovo-vibe-x2-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(lenovo-vibe-x2-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(lenovo-vibe-x2-test lenovo-vibe-x2-test)
+    ADD_TEST(NAME lenovo-vibe-x2-test COMMAND lenovo-vibe-x2-test)
 
     ADD_EXECUTABLE(lg-k10-eu-test test/mock/lg-k10-eu.cc)
     TARGET_INCLUDE_DIRECTORIES(lg-k10-eu-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(lg-k10-eu-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(lg-k10-eu-test lg-k10-eu-test)
+    ADD_TEST(NAME lg-k10-eu-test COMMAND lg-k10-eu-test)
 
     ADD_EXECUTABLE(lg-optimus-g-pro-test test/mock/lg-optimus-g-pro.cc)
     TARGET_INCLUDE_DIRECTORIES(lg-optimus-g-pro-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(lg-optimus-g-pro-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(lg-optimus-g-pro-test lg-optimus-g-pro-test)
+    ADD_TEST(NAME lg-optimus-g-pro-test COMMAND lg-optimus-g-pro-test)
 
     ADD_EXECUTABLE(moto-e-gen1-test test/mock/moto-e-gen1.cc)
     TARGET_INCLUDE_DIRECTORIES(moto-e-gen1-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(moto-e-gen1-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(moto-e-gen1-test moto-e-gen1-test)
+    ADD_TEST(NAME moto-e-gen1-test COMMAND moto-e-gen1-test)
 
     ADD_EXECUTABLE(moto-g-gen1-test test/mock/moto-g-gen1.cc)
     TARGET_INCLUDE_DIRECTORIES(moto-g-gen1-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(moto-g-gen1-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(moto-g-gen1-test moto-g-gen1-test)
+    ADD_TEST(NAME moto-g-gen1-test COMMAND moto-g-gen1-test)
 
     ADD_EXECUTABLE(moto-g-gen2-test test/mock/moto-g-gen2.cc)
     TARGET_INCLUDE_DIRECTORIES(moto-g-gen2-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(moto-g-gen2-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(moto-g-gen2-test moto-g-gen2-test)
+    ADD_TEST(NAME moto-g-gen2-test COMMAND moto-g-gen2-test)
 
     ADD_EXECUTABLE(moto-g-gen3-test test/mock/moto-g-gen3.cc)
     TARGET_INCLUDE_DIRECTORIES(moto-g-gen3-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(moto-g-gen3-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(moto-g-gen3-test moto-g-gen3-test)
+    ADD_TEST(NAME moto-g-gen3-test COMMAND moto-g-gen3-test)
 
     ADD_EXECUTABLE(moto-g-gen4-test test/mock/moto-g-gen4.cc)
     TARGET_INCLUDE_DIRECTORIES(moto-g-gen4-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(moto-g-gen4-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(moto-g-gen4-test moto-g-gen4-test)
+    ADD_TEST(NAME moto-g-gen4-test COMMAND moto-g-gen4-test)
 
     ADD_EXECUTABLE(moto-g-gen5-test test/mock/moto-g-gen5.cc)
     TARGET_INCLUDE_DIRECTORIES(moto-g-gen5-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(moto-g-gen5-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(moto-g-gen5-test moto-g-gen5-test)
+    ADD_TEST(NAME moto-g-gen5-test COMMAND moto-g-gen5-test)
 
     ADD_EXECUTABLE(nexus-s-test test/mock/nexus-s.cc)
     TARGET_INCLUDE_DIRECTORIES(nexus-s-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(nexus-s-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(nexus-s-test nexus-s-test)
+    ADD_TEST(NAME nexus-s-test COMMAND nexus-s-test)
 
     ADD_EXECUTABLE(nexus4-test test/mock/nexus4.cc)
     TARGET_INCLUDE_DIRECTORIES(nexus4-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(nexus4-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(nexus4-test nexus4-test)
+    ADD_TEST(NAME nexus4-test COMMAND nexus4-test)
 
     ADD_EXECUTABLE(nexus6-test test/mock/nexus6.cc)
     TARGET_INCLUDE_DIRECTORIES(nexus6-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(nexus6-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(nexus6-test nexus6-test)
+    ADD_TEST(NAME nexus6-test COMMAND nexus6-test)
 
     ADD_EXECUTABLE(nexus10-test test/mock/nexus10.cc)
     TARGET_INCLUDE_DIRECTORIES(nexus10-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(nexus10-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(nexus10-test nexus10-test)
+    ADD_TEST(NAME nexus10-test COMMAND nexus10-test)
 
     ADD_EXECUTABLE(padcod-10.1-test test/mock/padcod-10.1.cc)
     TARGET_INCLUDE_DIRECTORIES(padcod-10.1-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(padcod-10.1-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(padcod-10.1-test padcod-10.1-test)
+    ADD_TEST(NAME padcod-10.1-test COMMAND padcod-10.1-test)
 
     ADD_EXECUTABLE(xiaomi-redmi-2a-test test/mock/xiaomi-redmi-2a.cc)
     TARGET_INCLUDE_DIRECTORIES(xiaomi-redmi-2a-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(xiaomi-redmi-2a-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(xiaomi-redmi-2a-test xiaomi-redmi-2a-test)
+    ADD_TEST(NAME xiaomi-redmi-2a-test COMMAND xiaomi-redmi-2a-test)
 
     ADD_EXECUTABLE(xperia-sl-test test/mock/xperia-sl.cc)
     TARGET_INCLUDE_DIRECTORIES(xperia-sl-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(xperia-sl-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(xperia-sl-test xperia-sl-test)
+    ADD_TEST(NAME xperia-sl-test COMMAND xperia-sl-test)
   ENDIF()
 
   IF(CMAKE_SYSTEM_NAME STREQUAL "Android" AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv5te|armv7-a|aarch64)$")
     ADD_EXECUTABLE(alcatel-revvl-test test/mock/alcatel-revvl.cc)
     TARGET_INCLUDE_DIRECTORIES(alcatel-revvl-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(alcatel-revvl-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(alcatel-revvl-test alcatel-revvl-test)
+    ADD_TEST(NAME alcatel-revvl-test COMMAND alcatel-revvl-test)
 
     ADD_EXECUTABLE(galaxy-a8-2018-test test/mock/galaxy-a8-2018.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-a8-2018-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-a8-2018-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-a8-2018-test galaxy-a8-2018-test)
+    ADD_TEST(NAME galaxy-a8-2018-test COMMAND galaxy-a8-2018-test)
 
     ADD_EXECUTABLE(galaxy-c9-pro-test test/mock/galaxy-c9-pro.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-c9-pro-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-c9-pro-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-c9-pro-test galaxy-c9-pro-test)
+    ADD_TEST(NAME galaxy-c9-pro-test COMMAND galaxy-c9-pro-test)
 
     ADD_EXECUTABLE(galaxy-s6-test test/mock/galaxy-s6.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s6-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s6-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s6-test galaxy-s6-test)
+    ADD_TEST(NAME galaxy-s6-test COMMAND galaxy-s6-test)
 
     ADD_EXECUTABLE(galaxy-s7-us-test test/mock/galaxy-s7-us.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s7-us-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s7-us-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s7-us-test galaxy-s7-us-test)
+    ADD_TEST(NAME galaxy-s7-us-test COMMAND galaxy-s7-us-test)
 
     ADD_EXECUTABLE(galaxy-s7-global-test test/mock/galaxy-s7-global.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s7-global-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s7-global-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s7-global-test galaxy-s7-global-test)
+    ADD_TEST(NAME galaxy-s7-global-test COMMAND galaxy-s7-global-test)
 
     ADD_EXECUTABLE(galaxy-s8-us-test test/mock/galaxy-s8-us.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s8-us-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s8-us-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s8-us-test galaxy-s8-us-test)
+    ADD_TEST(NAME galaxy-s8-us-test COMMAND galaxy-s8-us-test)
 
     ADD_EXECUTABLE(galaxy-s8-global-test test/mock/galaxy-s8-global.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s8-global-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s8-global-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s8-global-test galaxy-s8-global-test)
+    ADD_TEST(NAME galaxy-s8-global-test COMMAND galaxy-s8-global-test)
 
     ADD_EXECUTABLE(galaxy-s9-us-test test/mock/galaxy-s9-us.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s9-us-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s9-us-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s9-us-test galaxy-s9-us-test)
+    ADD_TEST(NAME galaxy-s9-us-test COMMAND galaxy-s9-us-test)
 
     ADD_EXECUTABLE(galaxy-s9-global-test test/mock/galaxy-s9-global.cc)
     TARGET_INCLUDE_DIRECTORIES(galaxy-s9-global-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(galaxy-s9-global-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(galaxy-s9-global-test galaxy-s9-global-test)
+    ADD_TEST(NAME galaxy-s9-global-test COMMAND galaxy-s9-global-test)
 
     ADD_EXECUTABLE(huawei-mate-8-test test/mock/huawei-mate-8.cc)
     TARGET_INCLUDE_DIRECTORIES(huawei-mate-8-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(huawei-mate-8-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(huawei-mate-8-test huawei-mate-8-test)
+    ADD_TEST(NAME huawei-mate-8-test COMMAND huawei-mate-8-test)
 
     ADD_EXECUTABLE(huawei-mate-9-test test/mock/huawei-mate-9.cc)
     TARGET_INCLUDE_DIRECTORIES(huawei-mate-9-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(huawei-mate-9-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(huawei-mate-9-test huawei-mate-9-test)
+    ADD_TEST(NAME huawei-mate-9-test COMMAND huawei-mate-9-test)
 
     ADD_EXECUTABLE(huawei-mate-10-test test/mock/huawei-mate-10.cc)
     TARGET_INCLUDE_DIRECTORIES(huawei-mate-10-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(huawei-mate-10-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(huawei-mate-10-test huawei-mate-10-test)
+    ADD_TEST(NAME huawei-mate-10-test COMMAND huawei-mate-10-test)
 
     ADD_EXECUTABLE(huawei-mate-20-test test/mock/huawei-mate-20.cc)
     TARGET_INCLUDE_DIRECTORIES(huawei-mate-20-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(huawei-mate-20-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(huawei-mate-20-test huawei-mate-20-test)
+    ADD_TEST(NAME huawei-mate-20-test COMMAND huawei-mate-20-test)
 
     ADD_EXECUTABLE(huawei-p8-lite-test test/mock/huawei-p8-lite.cc)
     TARGET_INCLUDE_DIRECTORIES(huawei-p8-lite-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(huawei-p8-lite-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(huawei-p8-lite-test huawei-p8-lite-test)
+    ADD_TEST(NAME huawei-p8-lite-test COMMAND huawei-p8-lite-test)
 
     ADD_EXECUTABLE(huawei-p9-lite-test test/mock/huawei-p9-lite.cc)
     TARGET_INCLUDE_DIRECTORIES(huawei-p9-lite-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(huawei-p9-lite-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(huawei-p9-lite-test huawei-p9-lite-test)
+    ADD_TEST(NAME huawei-p9-lite-test COMMAND huawei-p9-lite-test)
 
     ADD_EXECUTABLE(huawei-p20-pro-test test/mock/huawei-p20-pro.cc)
     TARGET_INCLUDE_DIRECTORIES(huawei-p20-pro-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(huawei-p20-pro-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(huawei-p20-pro-test huawei-p20-pro-test)
+    ADD_TEST(NAME huawei-p20-pro-test COMMAND huawei-p20-pro-test)
 
     ADD_EXECUTABLE(iconia-one-10-test test/mock/iconia-one-10.cc)
     TARGET_INCLUDE_DIRECTORIES(iconia-one-10-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(iconia-one-10-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(iconia-one-10-test iconia-one-10-test)
+    ADD_TEST(NAME iconia-one-10-test COMMAND iconia-one-10-test)
 
     ADD_EXECUTABLE(meizu-pro-6-test test/mock/meizu-pro-6.cc)
     TARGET_INCLUDE_DIRECTORIES(meizu-pro-6-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(meizu-pro-6-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(meizu-pro-6-test meizu-pro-6-test)
+    ADD_TEST(NAME meizu-pro-6-test COMMAND meizu-pro-6-test)
 
     ADD_EXECUTABLE(meizu-pro-6s-test test/mock/meizu-pro-6s.cc)
     TARGET_INCLUDE_DIRECTORIES(meizu-pro-6s-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(meizu-pro-6s-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(meizu-pro-6s-test meizu-pro-6s-test)
+    ADD_TEST(NAME meizu-pro-6s-test COMMAND meizu-pro-6s-test)
 
     ADD_EXECUTABLE(meizu-pro-7-plus-test test/mock/meizu-pro-7-plus.cc)
     TARGET_INCLUDE_DIRECTORIES(meizu-pro-7-plus-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(meizu-pro-7-plus-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(meizu-pro-7-plus-test meizu-pro-7-plus-test)
+    ADD_TEST(NAME meizu-pro-7-plus-test COMMAND meizu-pro-7-plus-test)
 
     ADD_EXECUTABLE(nexus5x-test test/mock/nexus5x.cc)
     TARGET_INCLUDE_DIRECTORIES(nexus5x-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(nexus5x-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(nexus5x-test nexus5x-test)
+    ADD_TEST(NAME nexus5x-test COMMAND nexus5x-test)
 
     ADD_EXECUTABLE(nexus6p-test test/mock/nexus6p.cc)
     TARGET_INCLUDE_DIRECTORIES(nexus6p-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(nexus6p-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(nexus6p-test nexus6p-test)
+    ADD_TEST(NAME nexus6p-test COMMAND nexus6p-test)
 
     ADD_EXECUTABLE(nexus9-test test/mock/nexus9.cc)
     TARGET_INCLUDE_DIRECTORIES(nexus9-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(nexus9-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(nexus9-test nexus9-test)
+    ADD_TEST(NAME nexus9-test COMMAND nexus9-test)
 
     ADD_EXECUTABLE(oneplus-3t-test test/mock/oneplus-3t.cc)
     TARGET_INCLUDE_DIRECTORIES(oneplus-3t-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(oneplus-3t-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(oneplus-3t-test oneplus-3t-test)
+    ADD_TEST(NAME oneplus-3t-test COMMAND oneplus-3t-test)
 
     ADD_EXECUTABLE(oneplus-5-test test/mock/oneplus-5.cc)
     TARGET_INCLUDE_DIRECTORIES(oneplus-5-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(oneplus-5-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(oneplus-5-test oneplus-5-test)
+    ADD_TEST(NAME oneplus-5-test COMMAND oneplus-5-test)
 
     ADD_EXECUTABLE(oneplus-5t-test test/mock/oneplus-5t.cc)
     TARGET_INCLUDE_DIRECTORIES(oneplus-5t-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(oneplus-5t-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(oneplus-5t-test oneplus-5t-test)
+    ADD_TEST(NAME oneplus-5t-test COMMAND oneplus-5t-test)
 
     ADD_EXECUTABLE(oppo-a37-test test/mock/oppo-a37.cc)
     TARGET_INCLUDE_DIRECTORIES(oppo-a37-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(oppo-a37-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(oppo-a37-test oppo-a37-test)
+    ADD_TEST(NAME oppo-a37-test COMMAND oppo-a37-test)
 
     ADD_EXECUTABLE(oppo-r9-test test/mock/oppo-r9.cc)
     TARGET_INCLUDE_DIRECTORIES(oppo-r9-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(oppo-r9-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(oppo-r9-test oppo-r9-test)
+    ADD_TEST(NAME oppo-r9-test COMMAND oppo-r9-test)
 
     ADD_EXECUTABLE(oppo-r15-test test/mock/oppo-r15.cc)
     TARGET_INCLUDE_DIRECTORIES(oppo-r15-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(oppo-r15-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(oppo-r15-test oppo-r15-test)
+    ADD_TEST(NAME oppo-r15-test COMMAND oppo-r15-test)
 
     ADD_EXECUTABLE(pixel-test test/mock/pixel.cc)
     TARGET_INCLUDE_DIRECTORIES(pixel-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(pixel-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(pixel-test pixel-test)
+    ADD_TEST(NAME pixel-test COMMAND pixel-test)
 
     ADD_EXECUTABLE(pixel-c-test test/mock/pixel-c.cc)
     TARGET_INCLUDE_DIRECTORIES(pixel-c-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(pixel-c-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(pixel-c-test pixel-c-test)
+    ADD_TEST(NAME pixel-c-test COMMAND pixel-c-test)
 
     ADD_EXECUTABLE(pixel-xl-test test/mock/pixel-xl.cc)
     TARGET_INCLUDE_DIRECTORIES(pixel-xl-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(pixel-xl-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(pixel-xl-test pixel-xl-test)
+    ADD_TEST(NAME pixel-xl-test COMMAND pixel-xl-test)
 
     ADD_EXECUTABLE(pixel-2-xl-test test/mock/pixel-2-xl.cc)
     TARGET_INCLUDE_DIRECTORIES(pixel-2-xl-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(pixel-2-xl-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(pixel-2-xl-test pixel-2-xl-test)
+    ADD_TEST(NAME pixel-2-xl-test COMMAND pixel-2-xl-test)
 
     ADD_EXECUTABLE(xiaomi-mi-5c-test test/mock/xiaomi-mi-5c.cc)
     TARGET_INCLUDE_DIRECTORIES(xiaomi-mi-5c-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(xiaomi-mi-5c-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(xiaomi-mi-5c-test xiaomi-mi-5c-test)
+    ADD_TEST(NAME xiaomi-mi-5c-test COMMAND xiaomi-mi-5c-test)
 
     ADD_EXECUTABLE(xiaomi-redmi-note-3-test test/mock/xiaomi-redmi-note-3.cc)
     TARGET_INCLUDE_DIRECTORIES(xiaomi-redmi-note-3-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(xiaomi-redmi-note-3-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(xiaomi-redmi-note-3-test xiaomi-redmi-note-3-test)
+    ADD_TEST(NAME xiaomi-redmi-note-3-test COMMAND xiaomi-redmi-note-3-test)
 
     ADD_EXECUTABLE(xiaomi-redmi-note-4-test test/mock/xiaomi-redmi-note-4.cc)
     TARGET_INCLUDE_DIRECTORIES(xiaomi-redmi-note-4-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(xiaomi-redmi-note-4-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(xiaomi-redmi-note-4-test xiaomi-redmi-note-4-test)
+    ADD_TEST(NAME xiaomi-redmi-note-4-test COMMAND xiaomi-redmi-note-4-test)
 
     ADD_EXECUTABLE(xperia-c4-dual-test test/mock/xperia-c4-dual.cc)
     TARGET_INCLUDE_DIRECTORIES(xperia-c4-dual-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(xperia-c4-dual-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(xperia-c4-dual-test xperia-c4-dual-test)
+    ADD_TEST(NAME xperia-c4-dual-test COMMAND xperia-c4-dual-test)
   ENDIF()
 
   IF(CMAKE_SYSTEM_NAME STREQUAL "Android" AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(i686|x86_64)$")
     ADD_EXECUTABLE(alldocube-iwork8-test test/mock/alldocube-iwork8.cc)
     TARGET_INCLUDE_DIRECTORIES(alldocube-iwork8-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(alldocube-iwork8-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(alldocube-iwork8-test alldocube-iwork8-test)
+    ADD_TEST(NAME alldocube-iwork8-test COMMAND alldocube-iwork8-test)
 
     ADD_EXECUTABLE(leagoo-t5c-test test/mock/leagoo-t5c.cc)
     TARGET_INCLUDE_DIRECTORIES(leagoo-t5c-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(leagoo-t5c-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(leagoo-t5c-test leagoo-t5c-test)
+    ADD_TEST(NAME leagoo-t5c-test COMMAND leagoo-t5c-test)
 
     ADD_EXECUTABLE(memo-pad-7-test test/mock/memo-pad-7.cc)
     TARGET_INCLUDE_DIRECTORIES(memo-pad-7-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(memo-pad-7-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(memo-pad-7-test memo-pad-7-test)
+    ADD_TEST(NAME memo-pad-7-test COMMAND memo-pad-7-test)
 
     ADD_EXECUTABLE(zenfone-c-test test/mock/zenfone-c.cc)
     TARGET_INCLUDE_DIRECTORIES(zenfone-c-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(zenfone-c-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(zenfone-c-test zenfone-c-test)
+    ADD_TEST(NAME zenfone-c-test COMMAND zenfone-c-test)
 
     ADD_EXECUTABLE(zenfone-2-test test/mock/zenfone-2.cc)
     TARGET_INCLUDE_DIRECTORIES(zenfone-2-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(zenfone-2-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(zenfone-2-test zenfone-2-test)
+    ADD_TEST(NAME zenfone-2-test COMMAND zenfone-2-test)
 
     ADD_EXECUTABLE(zenfone-2e-test test/mock/zenfone-2e.cc)
     TARGET_INCLUDE_DIRECTORIES(zenfone-2e-test BEFORE PRIVATE test/mock)
     TARGET_LINK_LIBRARIES(zenfone-2e-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(zenfone-2e-test zenfone-2e-test)
+    ADD_TEST(NAME zenfone-2e-test COMMAND zenfone-2e-test)
   ENDIF()
 ENDIF()
 
@@ -758,14 +758,14 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_TESTS)
   CPUINFO_TARGET_ENABLE_CXX11(init-test)
   CPUINFO_TARGET_RUNTIME_LIBRARY(init-test)
   TARGET_LINK_LIBRARIES(init-test PRIVATE cpuinfo gtest gtest_main)
-  ADD_TEST(init-test init-test)
+  ADD_TEST(NAME init-test COMMAND init-test)
 
   IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
     ADD_EXECUTABLE(get-current-test test/get-current.cc)
     CPUINFO_TARGET_ENABLE_CXX11(get-current-test)
     CPUINFO_TARGET_RUNTIME_LIBRARY(get-current-test)
     TARGET_LINK_LIBRARIES(get-current-test PRIVATE cpuinfo gtest gtest_main)
-    ADD_TEST(get-current-test get-current-test)
+    ADD_TEST(NAME get-current-test COMMAND get-current-test)
   ENDIF()
 
   IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$")
@@ -773,7 +773,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_TESTS)
     CPUINFO_TARGET_ENABLE_CXX11(brand-string-test)
     CPUINFO_TARGET_RUNTIME_LIBRARY(brand-string-test)
     TARGET_LINK_LIBRARIES(brand-string-test PRIVATE cpuinfo_internals gtest gtest_main)
-    ADD_TEST(brand-string-test brand-string-test)
+    ADD_TEST(NAME brand-string-test COMMAND brand-string-test)
   ENDIF()
 
   IF(CMAKE_SYSTEM_NAME STREQUAL "Android" AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv[5-8].*|aarch64)$")
@@ -793,14 +793,14 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_TESTS)
     CPUINFO_TARGET_ENABLE_CXX11(chipset-test)
     CPUINFO_TARGET_RUNTIME_LIBRARY(chipset-test)
     TARGET_LINK_LIBRARIES(chipset-test PRIVATE android_properties_interface gtest gtest_main)
-    ADD_TEST(chipset-test chipset-test)
+    ADD_TEST(NAME chipset-test COMMAND chipset-test)
 
     ADD_EXECUTABLE(cache-test test/arm-cache.cc)
     CPUINFO_TARGET_ENABLE_CXX11(cache-test)
     CPUINFO_TARGET_RUNTIME_LIBRARY(cache-test)
     TARGET_COMPILE_DEFINITIONS(cache-test PRIVATE __STDC_LIMIT_MACROS=1 __STDC_CONSTANT_MACROS=1)
     TARGET_LINK_LIBRARIES(cache-test PRIVATE cpuinfo_internals gtest gtest_main)
-    ADD_TEST(cache-test, cache-test)
+    ADD_TEST(NAME cache-test COMMAND cache-test)
   ENDIF()
 ENDIF()