[ros-diffs] [tkreuzer] 50207: [CMAKE] - fix decorations on non-x86 builds - improve batt and aclui - remove set_export_spec macro

Author: tkreuzer
Date: Wed Dec 29 08:08:18 2010
New Revision: 50207

URL: http://svn.reactos.org/svn/reactos?rev=50207&view=rev
Log:
[CMAKE]
- fix decorations on non-x86 builds
- improve batt and aclui
- remove set_export_spec macro

Modified:
    branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt
    branches/cmake-bringup/dll/win32/batt/CMakeLists.txt
    branches/cmake-bringup/gcc.cmake

Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/CM...
==============================================================================
--- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Wed Dec 29 08:08:18 2010
@@ -1,3 +1,5 @@
+
+spec2def(aclui.dll aclui.spec)

set_unicode()

@@ -18,9 +20,7 @@

set_module_type(aclui win32dll)

-set_export_spec(aclui aclui.spec aclui.dll)
-
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
+add_importlib_target(aclui.spec)

add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)

Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CMa...
==============================================================================
--- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Wed Dec 29 08:08:18 2010
@@ -1,3 +1,5 @@
+
+spec2def(batt.dll batt.spec)

set_unicode()

@@ -8,9 +10,7 @@

set_module_type(batt win32dll)

-set_export_spec(batt batt.spec)
-
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def)
+add_importlib_target(batt.spec)

add_importlibs(batt msvcrt kernel32)

Modified: branches/cmake-bringup/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=5020...
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Dec 29 08:08:18 2010
@@ -224,6 +224,10 @@
     endforeach()
 endmacro()

+if(NOT ARCH MATCHES i386)
+    set(DECO_OPTION "-@")
+endif()
+
 macro(add_importlib_target _exports_file)

get_filename_component(_name ${_exports_file} NAME_WE)
@@ -234,10 +238,6 @@
             set(DLLNAME_OPTION "-n=${ARGV1}")
         else()
             set(DLLNAME_OPTION "")
-        endif()
-
-        if(NOT ARCH MATCHES i386)
-            set(DECO_OPTION "-@")
         endif()

add_custom_command(
@@ -273,17 +273,6 @@
     list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
 endmacro()

-# Optional 3rd parameter: dllname
-macro(set_export_spec _module _spec_file)
-    get_filename_component(_file ${_spec_file} NAME_WE)
-    if (${ARGC} GREATER 2)
-        set(_dllname ${ARGV2})
-    else()
-        set(_dllname ${_file}.dll)
-    endif()
-    spec2def(${_dllname} ${_spec_file})
-endmacro()
-
 #pseh lib, needed with mingw
 set(PSEH_LIB "pseh")