[ros-diffs] [jgardou] 49380: [CMAKE] - cmake handles gracefully def files if you tell him to do ; -) - partial revert of an (accidental?) kernel32 change

Author: jgardou
Date: Sun Oct 31 22:15:35 2010
New Revision: 49380

URL: http://svn.reactos.org/svn/reactos?rev=49380&view=rev
Log:
[CMAKE]
  - cmake handles gracefully def files if you tell him to do ;-)
  - partial revert of an (accidental?) kernel32 change

Modified:
    branches/cmake-bringup/CMakeMacros.cmake
    branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt

Modified: branches/cmake-bringup/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake…
==============================================================================
--- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sun Oct 31 22:15:35 2010
@@ -46,7 +46,9 @@
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
         COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname}
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
+    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
+        PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
 ENDMACRO(spec2def _dllname _spec_file)
 
 if (NOT MSVC)

Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3…
==============================================================================
--- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun Oct 31
22:15:35 2010
@@ -100,8 +100,8 @@
 
 if(ARCH MATCHES i386)
 list(APPEND SOURCE
-#    thread/i386/fiber.S
-#    thread/i386/thread.S
+    thread/i386/fiber.S
+    thread/i386/thread.S
 )
 elseif(ARCH MATCHES amd64)
 list(APPEND SOURCE