[ros-diffs] [akhaldi] 49637: [CMAKE] - Revert back to including the definition files into the source files list.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Fri Nov 19 17:41:49 UTC 2010


Author: akhaldi
Date: Fri Nov 19 17:41:48 2010
New Revision: 49637

URL: http://svn.reactos.org/svn/reactos?rev=49637&view=rev
Log:
[CMAKE]
- Revert back to including the definition files into the source files list.

Modified:
    branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/msc.cmake

Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt?rev=49637&r1=49636&r2=49637&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Fri Nov 19 17:41:48 2010
@@ -4,7 +4,8 @@
 list(APPEND SOURCE
     acledit.c
     stubs.c
-    acledit.rc)
+    acledit.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 
 add_library(acledit SHARED ${SOURCE})
 

Modified: branches/cmake-bringup/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=49637&r1=49636&r2=49637&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov 19 17:41:48 2010
@@ -154,7 +154,7 @@
   # empty for now, while import libs are shipped
 endmacro()
 
-MACRO(spec2def _dllname _spec_file)
+macro(spec2def _dllname _spec_file)
     get_filename_component(_file ${_spec_file} NAME_WE)
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
@@ -162,10 +162,7 @@
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
         PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
-    add_custom_target(
-        ${_dllname}.def
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def)
-ENDMACRO(spec2def _dllname _spec_file)
+endmacro()
 
 # Optional 3rd parameter: dllname
 macro(set_export_spec _module _spec_file)
@@ -176,8 +173,6 @@
         set(_dllname ${_file}.dll)
     endif()
     spec2def(${_dllname} ${_spec_file})
-    target_link_libraries(${_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=49637&r1=49636&r2=49637&view=diff
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Nov 19 17:41:48 2010
@@ -148,18 +148,15 @@
     endforeach()
 endmacro()
 
-MACRO(spec2def _dllname _spec_file)
+macro(spec2def _dllname _spec_file)
     get_filename_component(_file ${_spec_file} NAME_WE)
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
-        COMMAND native-spec2def -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)
+endmacro()
 
 # Optional 3rd parameter: dllname
 macro(set_export_spec _module _spec_file)
@@ -170,8 +167,6 @@
         set(_dllname ${_file}.dll)
     endif()
     spec2def(${_dllname} ${_spec_file})
-    add_linkerflag(${_module} "/DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def")
-    add_dependencies(${_module} ${_dllname}.def)
 endmacro()
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)




More information about the Ros-diffs mailing list