[CMAKE]
authorJérôme Gardou <jerome.gardou@reactos.org>
Sun, 31 Oct 2010 22:15:35 +0000 (22:15 +0000)
committerJérôme Gardou <jerome.gardou@reactos.org>
Sun, 31 Oct 2010 22:15:35 +0000 (22:15 +0000)
  - cmake handles gracefully def files if you tell him to do ;-)
  - partial revert of an (accidental?) kernel32 change

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

CMakeMacros.cmake
dll/win32/kernel32/CMakeLists.txt

index 54b8444..b77ce8f 100644 (file)
@@ -46,7 +46,9 @@ MACRO(spec2def _dllname _spec_file)
     add_custom_command(\r
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def\r
         COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname}\r
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})\r
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
+    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
+        PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)\r
 ENDMACRO(spec2def _dllname _spec_file)\r
 \r
 if (NOT MSVC)\r
index c6c08f4..b4cd40a 100644 (file)
@@ -100,8 +100,8 @@ list(APPEND SOURCE
 
 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