Author: dgorbachev
Date: Wed Sep 5 21:39:43 2012
New Revision: 57242
URL:
http://svn.reactos.org/svn/reactos?rev=57242&view=rev
Log:
[ATACTL]
Add set_cpp() to CMake script.
[LIBUSB][UNIATA]
Compile with no RTTI and exception handling.
Modified:
trunk/reactos/base/applications/atactl/CMakeLists.txt
trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt
trunk/reactos/drivers/usb/usbd/CMakeLists.txt
trunk/reactos/drivers/usb/usbehci/CMakeLists.txt
trunk/reactos/lib/drivers/libusb/CMakeLists.txt
Modified: trunk/reactos/base/applications/atactl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/C…
==============================================================================
--- trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/atactl/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43
2012
@@ -1,3 +1,4 @@
+set_cpp()
add_definitions(-DUSER_MODE)
include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata)
Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Wed Sep 5
21:39:43 2012
@@ -22,10 +22,14 @@
${SOURCE}
idedma.rc)
-if(NOT MSVC)
- # FIXME:
http://www.cmake.org/Bug/view.php?id=12998
+# FIXME:
http://www.cmake.org/Bug/view.php?id=12998
+if(MSVC)
+ #add_target_compile_flags(uniata "/GR-")
+ set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
+else()
#allow_warnings(uniata)
- set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS
"-Wno-error")
+ #add_target_compile_flags(uniata "-fno-exceptions -fno-rtti")
+ set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions
-fno-rtti -Wno-error")
endif()
add_pch(uniata stdafx.h)
Modified: trunk/reactos/drivers/usb/usbd/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/CMakeList…
==============================================================================
--- trunk/reactos/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012
@@ -10,4 +10,4 @@
add_importlibs(usbd ntoskrnl hal)
-add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all)
Modified: trunk/reactos/drivers/usb/usbehci/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/CMakeL…
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43
2012
@@ -34,4 +34,4 @@
set_module_type(usbehci kernelmodedriver)
add_importlibs(usbehci ntoskrnl hal usbd)
-add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all)
Modified: trunk/reactos/lib/drivers/libusb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/CMakeLi…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/CMakeLists.txt [iso-8859-1] Wed Sep 5 21:39:43 2012
@@ -19,3 +19,11 @@
add_library(libusb ${SOURCE})
add_dependencies(libusb bugcodes)
+# FIXME:
http://www.cmake.org/Bug/view.php?id=12998
+if(MSVC)
+ #add_target_compile_flags(libusb "/GR-")
+ set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/GR-")
+else()
+ #add_target_compile_flags(libusb "-fno-exceptions -fno-rtti")
+ set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions
-fno-rtti")
+endif()