[ros-diffs] [reactos] 01/13: [CMAKE] Some arm cmake fixes

[Mark Jansen]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5dc79c963ec7e071f159…

commit b5dc79c963ec7e071f1596247300a316d0cb9f76
Author:     Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Sun Aug 18 16:14:16 2019 +0200
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Tue Aug 20 22:27:59 2019 +0200

    [CMAKE] Some arm cmake fixes
---
 modules/rostests/apitests/crt/CMakeLists.txt |  2 +-
 sdk/include/ndk/tests/CMakeLists.txt         | 32 +++++++++++++++-------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/modules/rostests/apitests/crt/CMakeLists.txt
b/modules/rostests/apitests/crt/CMakeLists.txt
index 9525d2c02dd..8b253d21f66 100644
--- 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)
 
-if(NOT ARCH STREQUAL "amd64")
+if(NOT ARCH STREQUAL "amd64" AND NOT ARCH STREQUAL "arm")
   include(crtdll_crt_apitest.cmake)
 endif()
diff --git a/sdk/include/ndk/tests/CMakeLists.txt b/sdk/include/ndk/tests/CMakeLists.txt
index bd9028a677e..324c657ceeb 100644
--- a/sdk/include/ndk/tests/CMakeLists.txt
+++ b/sdk/include/ndk/tests/CMakeLists.txt
@@ -1,20 +1,22 @@
 
 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")
-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()
 
-add_dependencies(ndk_tests xdk psdk bugcodes)
+if(TARGET ndk_tests)
+    add_dependencies(ndk_tests xdk psdk bugcodes)
+endif()