[ros-diffs] [akhaldi] 65615: [W32KDLL_APITESTS] Properly handle ASM files. Also use set_module_type() instead of manually setting the entry point.

Author: akhaldi
Date: Fri Dec 12 13:17:16 2014
New Revision: 65615

URL: http://svn.reactos.org/svn/reactos?rev=65615&view=rev
Log:
[W32KDLL_APITESTS] Properly handle ASM files. Also use set_module_type() instead of manually setting the entry point.

Modified:
    trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt
    trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt
    trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt
    trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt
    trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt

Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_2...
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt	[iso-8859-1] Fri Dec 12 13:17:16 2014
@@ -1,9 +1,10 @@

spec2def(w32kdll_2k3sp2.dll w32kdll_2k3sp2.spec ADD_IMPORTLIB)
+add_asm_files(w32kdll_2k3sp2_asm sys-stubs.S)

add_library(w32kdll_2k3sp2 SHARED
     main.c
-    sys-stubs.S
+    ${w32kdll_2k3sp2_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2k3sp2.def)

set_module_type(w32kdll_2k3sp2 module)

Modified: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_2...
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt	[iso-8859-1] Fri Dec 12 13:17:16 2014
@@ -1,10 +1,11 @@

spec2def(w32kdll_2ksp4.dll w32kdll_2ksp4.spec)
+add_asm_files(w32kdll_2ksp4_asm w32kdll_2ksp4.S)

add_library(w32kdll_2ksp4 SHARED 
     main.c 
-    w32kdll_2ksp4.S
+    ${w32kdll_2ksp4_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_2ksp4.def)

-set_entrypoint(w32kdll_2ksp4 0)
+set_module_type(w32kdll_2ksp4 module)
 add_dependencies(w32kdll_2ksp4 psdk)

Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_r...
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt	[iso-8859-1] Fri Dec 12 13:17:16 2014
@@ -1,9 +1,10 @@

spec2def(w32kdll_ros.dll w32kdll_ros.spec ADD_IMPORTLIB)
+add_asm_files(w32kdll_ros_asm sys-stubs.S)

add_library(w32kdll_ros SHARED 
     main.c
-    sys-stubs.S
+    ${w32kdll_ros_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_ros.def)

set_module_type(w32kdll_ros module)

Modified: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_v...
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt	[iso-8859-1] Fri Dec 12 13:17:16 2014
@@ -1,10 +1,11 @@

spec2def(w32kdll_vista.spec w32kdll_vista.spec ADD_IMPORTLIB)
+add_asm_files(w32kdll_vista_asm w32kdll_vista.S)

add_library(w32kdll_vista SHARED
     main.c
-    w32kdll_vista.S
+    ${w32kdll_vista_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_vista.def)

-set_entrypoint(w32kdll_vista 0)
-add_dependencies(w32kdll_vista psdk )
+set_module_type(w32kdll_vista module)
+add_dependencies(w32kdll_vista psdk)

Modified: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_x...
==============================================================================
--- trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt	[iso-8859-1] Fri Dec 12 13:17:16 2014
@@ -1,9 +1,10 @@

spec2def(w32kdll_xpsp2.dll w32kdll_xpsp2.spec ADD_IMPORTLIB)
+add_asm_files(w32kdll_xpsp2_asm sys-stubs.S)

add_library(w32kdll_xpsp2 SHARED 
     main.c
-    sys-stubs.S
+    ${w32kdll_xpsp2_asm}
     ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_xpsp2.def)

set_module_type(w32kdll_xpsp2 module)