Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
* Addendum to my previous commit.

svn path=/trunk/; revision=56107
This commit is contained in:
Amine Khaldi 2012-03-10 20:16:56 +00:00
parent 9c0969d45c
commit f97cbbbc0c
7 changed files with 61 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
reactos/drivers/storage/class/cdrom_new/CMakeLists.txt
View file

@ -1,13 +1,24 @@
include_directories(..) include_directories(..)
add_library(cdrom_new SHARED cdrom.c data.c ioctl.c mmc.c sec.c) list(APPEND SOURCE
cdrom.c
data.c
ioctl.c
mmc.c
sec.c)
add_library(cdrom_new SHARED ${SOURCE})
target_link_libraries(cdrom_new libcntpr wdmguid) target_link_libraries(cdrom_new libcntpr wdmguid)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
if(MSVC) if(MSVC)
add_target_compile_flags(cdrom_new "/Gz") #add_target_compile_flags(cdrom_new "/Gz")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
else() else()
add_target_compile_flags(cdrom_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") #add_target_compile_flags(cdrom_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
endif() endif()
endif() endif()

6
reactos/drivers/storage/class/disk_new/CMakeLists.txt
View file

@ -15,10 +15,12 @@ add_library(disk_new SHARED
target_link_libraries(disk_new libcntpr wdmguid) target_link_libraries(disk_new libcntpr wdmguid)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
if(MSVC) if(MSVC)
add_target_compile_flags(disk_new "/Gz") #add_target_compile_flags(disk_new "/Gz")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
else() else()
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
#add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") #add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign")
endif() endif()

6
reactos/drivers/storage/classpnp/CMakeLists.txt
View file

@ -33,10 +33,12 @@ add_library(classpnp SHARED
class.rc) class.rc)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
if(MSVC) if(MSVC)
add_target_compile_flags(classpnp "/Gz") #add_target_compile_flags(classpnp "/Gz")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
else() else()
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
#add_target_compile_flags(classpnp "-mrtd -fno-builtin -w") #add_target_compile_flags(classpnp "-mrtd -fno-builtin -w")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -w") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -w")
endif() endif()

21
reactos/drivers/usb/usbehci/CMakeLists.txt
View file

@ -4,16 +4,16 @@ set_cpp()
remove_definitions(-D_WIN32_WINNT=0x502) remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
include_directories( list(APPEND SOURCE
${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
add_library(usbehci SHARED
usbehci.cpp usbehci.cpp
usb_request.cpp usb_request.cpp
usb_queue.cpp usb_queue.cpp
hardware.cpp hardware.cpp)
add_library(usbehci SHARED
${SOURCE}
usbehci.rc) usbehci.rc)
target_link_libraries(usbehci target_link_libraries(usbehci
@ -21,12 +21,15 @@ target_link_libraries(usbehci
libcntpr libcntpr
${PSEH_LIB}) ${PSEH_LIB})
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
if(MSVC) if(MSVC)
set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "/GR-") #add_target_compile_flags(usbehci "/GR-")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
else() else()
target_link_libraries(usbehci -lgcc) target_link_libraries(usbehci -lgcc)
set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") #add_target_compile_flags(usbehci "-fno-exceptions -fno-rtti")
endif(MSVC) set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
endif()
set_module_type(usbehci kernelmodedriver) set_module_type(usbehci kernelmodedriver)
add_importlibs(usbehci ntoskrnl hal usbd) add_importlibs(usbehci ntoskrnl hal usbd)

21
reactos/drivers/usb/usbohci/CMakeLists.txt
View file

@ -4,14 +4,16 @@ set_cpp()
remove_definitions(-D_WIN32_WINNT=0x502) remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_WIN32_WINNT=0x600)
include_directories( include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
add_library(usbohci SHARED list(APPEND SOURCE
usbohci.cpp usbohci.cpp
usb_request.cpp usb_request.cpp
usb_queue.cpp usb_queue.cpp
hardware.cpp hardware.cpp)
add_library(usbohci SHARED
${SOURCE}
usbohci.rc) usbohci.rc)
target_link_libraries(usbohci target_link_libraries(usbohci
@ -19,14 +21,17 @@ target_link_libraries(usbohci
libcntpr libcntpr
${PSEH_LIB}) ${PSEH_LIB})
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
if(MSVC) if(MSVC)
set_target_properties(usbohci PROPERTIES COMPILE_FLAGS "/GR-") #add_target_compile_flags(usbohci "/GR-")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
else() else()
target_link_libraries(usbohci -lgcc) target_link_libraries(usbohci -lgcc)
set_target_properties(usbohci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") #add_target_compile_flags(usbohci "-fno-exceptions -fno-rtti")
endif(MSVC) set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
endif()
set_module_type(usbohci kernelmodedriver) set_module_type(usbohci kernelmodedriver)
add_importlibs(usbohci ntoskrnl hal usbd) add_importlibs(usbohci ntoskrnl hal usbd)
add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all) add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all)

16
reactos/drivers/usb/usbuhci/CMakeLists.txt
View file

@ -7,11 +7,14 @@ add_definitions(-D_WIN32_WINNT=0x600)
include_directories( include_directories(
${REACTOS_SOURCE_DIR}/lib/drivers/libusb) ${REACTOS_SOURCE_DIR}/lib/drivers/libusb)
add_library(usbuhci SHARED list(APPEND SOURCE
usbuhci.cpp usbuhci.cpp
usb_request.cpp usb_request.cpp
usb_queue.cpp usb_queue.cpp
hardware.cpp hardware.cpp)
add_library(usbuhci SHARED
${SOURCE}
usbuhci.rc) usbuhci.rc)
target_link_libraries(usbuhci target_link_libraries(usbuhci
@ -19,12 +22,15 @@ target_link_libraries(usbuhci
libcntpr libcntpr
${PSEH_LIB}) ${PSEH_LIB})
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
if(MSVC) if(MSVC)
set_target_properties(usbuhci PROPERTIES COMPILE_FLAGS "/GR-") #add_target_compile_flags(usbuhci "/GR-")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
else() else()
target_link_libraries(usbuhci -lgcc) target_link_libraries(usbuhci -lgcc)
set_target_properties(usbuhci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") #add_target_compile_flags(usbuhci "-fno-exceptions -fno-rtti")
endif(MSVC) set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
endif()
set_module_type(usbuhci kernelmodedriver) set_module_type(usbuhci kernelmodedriver)
add_importlibs(usbuhci ntoskrnl hal usbd) add_importlibs(usbuhci ntoskrnl hal usbd)

6
reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
View file

@ -58,10 +58,11 @@ target_link_libraries(portcls
libcntpr libcntpr
${PSEH_LIB}) ${PSEH_LIB})
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
if(MSVC) if(MSVC)
add_target_compile_flags(portcls "/GR-") #add_target_compile_flags(portcls "/GR-")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
else() else()
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
#add_target_compile_flags(portcls "-fno-exceptions -fno-rtti") #add_target_compile_flags(portcls "-fno-exceptions -fno-rtti")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
endif() endif()
@ -70,4 +71,3 @@ set_module_type(portcls kernelmodedriver ENTRYPOINT 0 )
add_pch(portcls private.hpp) add_pch(portcls private.hpp)
add_importlibs(portcls ntoskrnl ks drmk hal) add_importlibs(portcls ntoskrnl ks drmk hal)
add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all) add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all)