[ros-diffs] [sir_richard] 48428: [CMAKE]: Simplify makefiles.

[sir_richard at svn.reactos.org]

Author: sir_richard
Date: Tue Aug  3 14:54:19 2010
New Revision: 48428

URL: http://svn.reactos.org/svn/reactos?rev=48428&view=rev
Log:
[CMAKE]: Simplify makefiles.

Modified:
    branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt
    branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt
    branches/cmake-bringup/lib/pseh/CMakeLists.txt
    branches/cmake-bringup/lib/rtl/CMakeLists.txt

Modified: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt?rev=48428&r1=48427&r2=48428&view=diff
==============================================================================
--- branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Tue Aug  3 14:54:19 2010
@@ -1,14 +1,7 @@
-
 add_definitions(-D__NTDRIVER__)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include)
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
-
-foreach(arg ${defines})
-  set(result_defs "${result_defs} -D${arg}")
-endforeach(arg ${defines})
-
-set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>")
 
 file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/network/${ARCH}/checksum.S)
 file(GLOB_RECURSE SOURCE "*.c")

Modified: branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt?rev=48428&r1=48427&r2=48428&view=diff
==============================================================================
--- branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] Tue Aug  3 14:54:19 2010
@@ -1,13 +1,2 @@
-
-get_directory_property(defines COMPILE_DEFINITIONS)
-
-foreach(arg ${defines})
-  set(result_defs "${result_defs} -D${arg}")
-endforeach(arg ${defines})
-
-set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>")
-
-set_source_files_properties(${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S PROPERTIES GENERATED TRUE)
-
 add_library(ntdllsys ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S)
 add_dependencies(ntdllsys ntdll_S)

Modified: branches/cmake-bringup/lib/pseh/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/pseh/CMakeLists.txt?rev=48428&r1=48427&r2=48428&view=diff
==============================================================================
--- branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] Tue Aug  3 14:54:19 2010
@@ -1,14 +1,4 @@
-
 file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.S)
-
-get_directory_property(defines COMPILE_DEFINITIONS)
-
-foreach(arg ${defines})
-  set(result_defs "${result_defs} -D${arg}")
-endforeach(arg ${defines})
-
-set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>")
-
 file(GLOB SOURCE "*.c")
 
 add_library(pseh ${ARCH_SOURCE} ${SOURCE})

Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeLists.txt?rev=48428&r1=48427&r2=48428&view=diff
==============================================================================
--- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Tue Aug  3 14:54:19 2010
@@ -7,21 +7,11 @@
 add_definitions(-D_NTDLLBUILD_)
 
 file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.S)
-
-get_directory_property(defines COMPILE_DEFINITIONS)
-
-foreach(arg ${defines})
-  set(result_defs "${result_defs} -D${arg}")
-endforeach(arg ${defines})
-
-set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>")
-
 file(GLOB SOURCE "*.c")
 
 list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/avlsupp.c
                         ${CMAKE_CURRENT_SOURCE_DIR}/mem.c
-                        ${CMAKE_CURRENT_SOURCE_DIR}/memgen.c
-    )
+                        ${CMAKE_CURRENT_SOURCE_DIR}/memgen.c)
 
 add_library(rtl ${ARCH_SOURCE} ${SOURCE})
 add_dependencies(rtl psdk)