[ros-diffs] [akhaldi] 49930: [CMAKE] - Add dllname optional parameter to the import lib creation macro. - Use it in the kernel.

Author: akhaldi
Date: Fri Dec  3 16:17:41 2010
New Revision: 49930

URL: http://svn.reactos.org/svn/reactos?rev=49930&view=rev
Log:
[CMAKE]
- Add dllname optional parameter to the import lib creation macro.
- Use it in the kernel.

Modified:
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/ntoskrnl/CMakeLists.txt

Modified: branches/cmake-bringup/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=499…
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Dec  3 16:17:41 2010
@@ -196,9 +196,16 @@
 
 macro(add_importlib_target _spec_file)
     get_filename_component(_name ${_spec_file} NAME_WE)
+    
+    if (${ARGC} GREATER 1)
+        set(DLLNAME_OPTION "-n=${ARGV1}")
+    else()
+        set(DLLNAME_OPTION "")
+    endif()
+    
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
-        COMMAND native-spec2def -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def
${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
+        COMMAND native-spec2def ${DLLNAME_OPTION}
-d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
         COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def
--kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
     add_custom_target(

Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis…
==============================================================================
--- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Fri Dec  3 16:17:41 2010
@@ -435,4 +435,4 @@
 
 add_minicd_target(ntoskrnl reactos ntoskrnl.exe)
 add_livecd_target(ntoskrnl reactos/system32)
-add_importlib_target(ntoskrnl.spec)
+add_importlib_target(ntoskrnl.spec ntoskrnl.exe)