[ros-diffs] [akhaldi] 48695: [CMAKE] - Add cdrom, class2, disk and ramdisk to build.

Author: akhaldi
Date: Sat Sep  4 13:36:49 2010
New Revision: 48695

URL: http://svn.reactos.org/svn/reactos?rev=48695&view=rev
Log:
[CMAKE]
- Add cdrom, class2, disk and ramdisk to build.

Added:
    branches/cmake-bringup/drivers/storage/class/CMakeLists.txt   (with props)
    branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt   (with props)
    branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt   (with props)
    branches/cmake-bringup/drivers/storage/class/class2/libclass2.a   (with props)
    branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt   (with props)
    branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt   (with props)
Modified:
    branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt
    branches/cmake-bringup/drivers/storage/CMakeLists.txt

Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/b…
==============================================================================
--- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Sat Sep  4
13:36:49 2010
@@ -2,8 +2,6 @@
 set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER>
<CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS>
<CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS>
<LINK_LIBRARIES>")
 
 add_definitions(-D_BATTERYCLASS_)
-
-spec2def(battc ${CMAKE_CURRENT_SOURCE_DIR}/battc.spec
${CMAKE_CURRENT_BINARY_DIR}/battc.def)
 
 add_library(battc SHARED battc.c battc.rc)
 

Modified: branches/cmake-bringup/drivers/storage/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/C…
==============================================================================
--- branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/storage/CMakeLists.txt [iso-8859-1] Sat Sep  4 13:36:49
2010
@@ -1,4 +1,5 @@
 
+add_subdirectory(class)
 add_subdirectory(ide)
 add_subdirectory(port)
 add_subdirectory(scsiport)

Added: branches/cmake-bringup/drivers/storage/class/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/class/CMakeLists.txt (added)
+++ branches/cmake-bringup/drivers/storage/class/CMakeLists.txt [iso-8859-1] Sat Sep  4
13:36:49 2010
@@ -1,0 +1,5 @@
+
+add_subdirectory(cdrom)
+add_subdirectory(class2)
+add_subdirectory(disk)
+add_subdirectory(ramdisk)

Propchange: branches/cmake-bringup/drivers/storage/class/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt (added)
+++ branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] Sat Sep
 4 13:36:49 2010
@@ -1,0 +1,16 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER>
<CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS>
<CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS>
<LINK_LIBRARIES>")
+
+include_directories(..)
+
+add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc)
+
+set_target_properties(cdrom PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
+
+target_link_libraries(cdrom
+    ${REACTOS_SOURCE_DIR}/drivers/storage/class/class2/libclass2.a
+    ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_dependencies(cdrom psdk bugcodes)

Propchange: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt (added)
+++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Sat
Sep  4 13:36:49 2010
@@ -1,0 +1,18 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER>
<CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS>
<CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS>
<LINK_LIBRARIES>")
+
+include_directories(..)
+
+spec2def(class2 ${CMAKE_CURRENT_SOURCE_DIR}/class2.spec
${CMAKE_CURRENT_BINARY_DIR}/class2.def)
+
+add_library(class2 SHARED class2.c class2.rc)
+
+set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
+
+target_link_libraries(class2
+    ${CMAKE_CURRENT_BINARY_DIR}/class2.def
+    ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a 
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_dependencies(class2 class2_def psdk bugcodes)

Propchange: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/drivers/storage/class/class2/libclass2.a
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
Binary file - no diff available.

Propchange: branches/cmake-bringup/drivers/storage/class/class2/libclass2.a
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt (added)
+++ branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] Sat Sep 
4 13:36:49 2010
@@ -1,0 +1,16 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER>
<CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS>
<CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS>
<LINK_LIBRARIES>")
+
+include_directories(..)
+
+add_library(disk SHARED disk.c disk.rc)
+
+set_target_properties(disk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
+
+target_link_libraries(disk
+    ${REACTOS_SOURCE_DIR}/drivers/storage/class/class2/libclass2.a
+    ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_dependencies(disk psdk bugcodes)

Propchange: branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt (added)
+++ branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt [iso-8859-1] Sat
Sep  4 13:36:49 2010
@@ -1,0 +1,14 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER>
<CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS>
<CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS>
<LINK_LIBRARIES>")
+
+include_directories(..)
+
+add_library(ramdisk SHARED ramdisk.c ramdisk.rc)
+
+set_target_properties(ramdisk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
+
+target_link_libraries(ramdisk
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_dependencies(ramdisk psdk bugcodes)

Propchange: branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native