[ros-diffs] [tkreuzer] 49634: [CMAKE] Fix dependencies, fix native-spec2def

Author: tkreuzer
Date: Fri Nov 19 16:38:25 2010
New Revision: 49634

URL: http://svn.reactos.org/svn/reactos?rev=49634&view=rev
Log:
[CMAKE]
Fix dependencies, fix native-spec2def

Modified:
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/msc.cmake

Modified: branches/cmake-bringup/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=496…
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov 19 16:38:25 2010
@@ -161,7 +161,10 @@
         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})
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
-        PROPERTIES GENERATED TRUE)
+        PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
+    add_custom_target(
+        ${_dllname}.def
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)
 ENDMACRO(spec2def _dllname _spec_file)
 
 # Optional 3rd parameter: dllname
@@ -174,7 +177,7 @@
     endif()
     spec2def(${_dllname} ${_spec_file})
     target_link_libraries(${_module}
"${CMAKE_CURRENT_BINARY_DIR}/${_file}.def")
-    add_dependencies(${_module} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)
+    add_dependencies(${_module} ${_dllname}.def)
 endmacro()
 
 #pseh lib, needed with mingw

Modified: branches/cmake-bringup/msc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=496…
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Nov 19 16:38:25 2010
@@ -105,13 +105,13 @@
     # Generate the asm stub file
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm
-        COMMAND native-spec2pdef -s ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm
+        COMMAND native-spec2def -s ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
 
     # Generate a the export def file
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def
-        COMMAND native-spec2pdef -n -r ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def
+        COMMAND native-spec2def -n -r ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
 
     # Assemble the file
@@ -152,10 +152,13 @@
     get_filename_component(_file ${_spec_file} NAME_WE)
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
-        COMMAND native-spec2pdef -n  --dll ${_dllname}
${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
+        COMMAND native-spec2def -n  --dll ${_dllname}
${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
         PROPERTIES GENERATED TRUE)
+    add_custom_target(
+        ${_dllname}.def
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)
 ENDMACRO(spec2def _dllname _spec_file)
 
 # Optional 3rd parameter: dllname
@@ -168,7 +171,7 @@
     endif()
     spec2def(${_dllname} ${_spec_file})
     add_linkerflag(${_module} "/DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def")
-    add_dependencies(${_module} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)
+    add_dependencies(${_module} ${_dllname}.def)
 endmacro()
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)