[CMAKE]: Simplify makefiles.

svn path=/branches/cmake-bringup/; revision=48428

diff --git a/lib/drivers/ip/CMakeLists.txt b/lib/drivers/ip/CMakeLists.txt
index 9db80d3..f1a5892 100644 (file)
--- a/lib/drivers/ip/CMakeLists.txt
+++ b/lib/drivers/ip/CMakeLists.txt
@@ -1,15 +1,8 @@
-

 add_definitions(-D__NTDRIVER__)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include)
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
 
 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")
 
 file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/network/${ARCH}/checksum.S)
 file(GLOB_RECURSE SOURCE "*.c")
 

diff --git a/lib/ntdllsys/CMakeLists.txt b/lib/ntdllsys/CMakeLists.txt
index fb355f8..6066b9b 100644 (file)
--- a/lib/ntdllsys/CMakeLists.txt
+++ b/lib/ntdllsys/CMakeLists.txt
@@ -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)
 add_library(ntdllsys ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S)
 add_dependencies(ntdllsys ntdll_S)

diff --git a/lib/pseh/CMakeLists.txt b/lib/pseh/CMakeLists.txt
index c274bd0..74c2c66 100644 (file)
--- a/lib/pseh/CMakeLists.txt
+++ b/lib/pseh/CMakeLists.txt
@@ -1,14 +1,4 @@
-

 file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.S)
 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})
 file(GLOB SOURCE "*.c")
 
 add_library(pseh ${ARCH_SOURCE} ${SOURCE})

diff --git a/lib/rtl/CMakeLists.txt b/lib/rtl/CMakeLists.txt
index fda6e4c..ccb95c3 100644 (file)
--- a/lib/rtl/CMakeLists.txt
+++ b/lib/rtl/CMakeLists.txt
@@ -7,21 +7,11 @@ add_definitions(-D_NTSYSTEM_)
 add_definitions(-D_NTDLLBUILD_)
 
 file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}/*.S)
 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
 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)
 
 add_library(rtl ${ARCH_SOURCE} ${SOURCE})
 add_dependencies(rtl psdk)