[CMAKE] Some arm cmake fixes

diff --git a/modules/rostests/apitests/crt/CMakeLists.txt b/modules/rostests/apitests/crt/CMakeLists.txt
index 9525d2c..8b253d2 100644 (file)
--- a/modules/rostests/apitests/crt/CMakeLists.txt
+++ b/modules/rostests/apitests/crt/CMakeLists.txt
@@ -6,6 +6,6 @@ endif()
 include(ntdll_crt_apitest.cmake)
 include(msvcrt_crt_apitest.cmake)
 
 include(ntdll_crt_apitest.cmake)
 include(msvcrt_crt_apitest.cmake)
 

-if(NOT ARCH STREQUAL "amd64")
+if(NOT ARCH STREQUAL "amd64" AND NOT ARCH STREQUAL "arm")

   include(crtdll_crt_apitest.cmake)
 endif()
   include(crtdll_crt_apitest.cmake)
 endif()

diff --git a/sdk/include/ndk/tests/CMakeLists.txt b/sdk/include/ndk/tests/CMakeLists.txt
index bd9028a..324c657 100644 (file)
--- a/sdk/include/ndk/tests/CMakeLists.txt
+++ b/sdk/include/ndk/tests/CMakeLists.txt
@@ -1,20 +1,22 @@
 
 if(ARCH STREQUAL "amd64")
 
 if(ARCH STREQUAL "amd64")

-add_library(ndk_tests
-    win2003_x64.c
-    winvista_x64.c
-    win7_x64.c
-    win8_x64.c
-    win81_x64.c
-    win10_x64.c)
+    add_library(ndk_tests
+        win2003_x64.c
+        winvista_x64.c
+        win7_x64.c
+        win8_x64.c
+        win81_x64.c
+        win10_x64.c)

 elseif(ARCH STREQUAL "i386")
 elseif(ARCH STREQUAL "i386")

-add_library(ndk_tests
-    win2003_x86.c
-    winvista_x86.c
-    win7_x86.c
-    win8_x86.c
-    win81_x86.c
-    win10_x86.c)
+    add_library(ndk_tests
+        win2003_x86.c
+        winvista_x86.c
+        win7_x86.c
+        win8_x86.c
+        win81_x86.c
+        win10_x86.c)

 endif()
 
 endif()
 

-add_dependencies(ndk_tests xdk psdk bugcodes)
+if(TARGET ndk_tests)
+    add_dependencies(ndk_tests xdk psdk bugcodes)
+endif()