[tkreuzer] 56278: [CMAKE] Move common macros from *idl-support.cmake to CMakeMacros.cmake, remove obsolete definitions
Author: tkreuzer Date: Thu Mar 29 14:49:48 2012 New Revision: 56278
URL: http://svn.reactos.org/svn/reactos?rev=56278&view=rev Log: [CMAKE] Move common macros from *idl-support.cmake to CMakeMacros.cmake, remove obsolete definitions
Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/midl-support.cmake trunk/reactos/cmake/widl-support.cmake
Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?rev... ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Thu Mar 29 14:49:48 2012 @@ -403,3 +403,19 @@ DEPENDS ${__in}) endif() endfunction() + +function(get_includes OUTPUT_VAR) + get_directory_property(_includes INCLUDE_DIRECTORIES) + foreach(arg ${_includes}) + list(APPEND __tmp_var -I${arg}) + endforeach() + set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) +endfunction() + +function(get_defines OUTPUT_VAR) + get_directory_property(_defines COMPILE_DEFINITIONS) + foreach(arg ${_defines}) + list(APPEND __tmp_var -D${arg}) + endforeach() + set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) +endfunction()
Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?re... ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Thu Mar 29 14:49:48 2012 @@ -1,6 +1,5 @@
#idl files support -if(MSVC) set(IDL_COMPILER midl) set(IDL_HEADER_ARG /h) #.h set(IDL_HEADER_ARG2 /h) #.h @@ -17,41 +16,6 @@ set(IDL_FLAGS /nologo /no_def_idir) endif() set(IDL_DEPENDS "") -else() - set(IDL_COMPILER native-widl) - set(IDL_HEADER_ARG -h -o) #.h - set(IDL_HEADER_ARG2 -h -H) #.h - set(IDL_TYPELIB_ARG -t -o) #.tlb - set(IDL_SERVER_ARG -Oif -s -o) #.c for server library - set(IDL_CLIENT_ARG -Oif -c -o) #.c for stub client library - set(IDL_PROXY_ARG -p -o) - set(IDL_INTERFACE_ARG -u -o) - if(ARCH MATCHES i386) - set(IDL_FLAGS -m32 --win32) - elseif(ARCH MATCHES amd64) - set(IDL_FLAGS -m64 --win64) - else() - set(IDL_FLAGS "") - endif() - set(IDL_DEPENDS native-widl) -endif() - - -function(get_includes OUTPUT_VAR) - get_directory_property(_includes INCLUDE_DIRECTORIES) - foreach(arg ${_includes}) - list(APPEND __tmp_var -I${arg}) - endforeach() - set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) -endfunction() - -function(get_defines OUTPUT_VAR) - get_directory_property(_defines COMPILE_DEFINITIONS) - foreach(arg ${_defines}) - list(APPEND __tmp_var -D${arg}) - endforeach() - set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) -endfunction()
function(add_typelib) get_includes(INCLUDES)
Modified: trunk/reactos/cmake/widl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/widl-support.cmake?re... ============================================================================== --- trunk/reactos/cmake/widl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/widl-support.cmake [iso-8859-1] Thu Mar 29 14:49:48 2012 @@ -1,23 +1,5 @@
#idl files support -if(MSVC) - set(IDL_COMPILER midl) - set(IDL_HEADER_ARG /h) #.h - set(IDL_HEADER_ARG2 /h) #.h - set(IDL_TYPELIB_ARG /tlb) #.tlb - set(IDL_SERVER_ARG /sstub) #.c for stub server library - set(IDL_CLIENT_ARG /cstub) #.c for stub client library - set(IDL_PROXY_ARG /proxy) - set(IDL_INTERFACE_ARG /iid) - if(ARCH MATCHES i386) - set(IDL_FLAGS /nologo /win32 /no_def_idir) - elseif(ARCH MATCHES amd64) - set(IDL_FLAGS /nologo /amd64 /no_def_idir) - else() - set(IDL_FLAGS /nologo /no_def_idir) - endif() - set(IDL_DEPENDS "") -else() set(IDL_COMPILER native-widl) set(IDL_HEADER_ARG -h -o) #.h set(IDL_HEADER_ARG2 -h -H) #.h @@ -34,24 +16,6 @@ set(IDL_FLAGS "") endif() set(IDL_DEPENDS native-widl) -endif() - - -function(get_includes OUTPUT_VAR) - get_directory_property(_includes INCLUDE_DIRECTORIES) - foreach(arg ${_includes}) - list(APPEND __tmp_var -I${arg}) - endforeach() - set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) -endfunction() - -function(get_defines OUTPUT_VAR) - get_directory_property(_defines COMPILE_DEFINITIONS) - foreach(arg ${_defines}) - list(APPEND __tmp_var -D${arg}) - endforeach() - set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) -endfunction()
function(add_typelib) get_includes(INCLUDES)
-
tkreuzer＠svn.reactos.org