[ros-diffs] [akhaldi] 50525: [CMAKE] - The suffix variable already holds a dot, don't add another one. Fixes import libs generation.

[akhaldi]

Author: akhaldi
Date: Fri Jan 28 09:31:54 2011
New Revision: 50525

URL: http://svn.reactos.org/svn/reactos?rev=50525&view=rev
Log:
[CMAKE]
- The suffix variable already holds a dot, don't add another one. Fixes import 
libs generation.

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=50525&r1=50524&r2=50525&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Jan 28 09:31:54 2011
@@ -274,7 +274,7 @@
 
         add_custom_command(
             OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
-            COMMAND native-spec2def -n=${_name}.${_suffix} -a=${ARCH2} 
-d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def 
${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
+            COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} 
-d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def 
${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
             COMMAND ${MINGW_PREFIX}dlltool --def 
${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at 
--output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})
 

Modified: branches/cmake-bringup/msc.cmake
URL: 
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=50525&r1=50524&r2=50525&view=diff
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Jan 28 09:31:54 2011
@@ -143,7 +143,7 @@
     # Generate the asm stub file and the export def file
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm 
${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def
-        COMMAND native-spec2def --ms --kill-at -r -n=${_name}.${_suffix} 
-d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def 
-l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm 
${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
+        COMMAND native-spec2def --ms --kill-at -r -n=${_name}${_suffix} 
-d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def 
-l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm 
${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file})
 
     # Assemble the stub file