Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56283: [CMAKE] - include wincodec_i.c into uuid on MSVC builds - Improve midl support
by tkreuzer＠svn.reactos.org 30 Mar '12

30 Mar '12

Author: tkreuzer Date: Fri Mar 30 15:36:19 2012 New Revision: 56283 URL: http://svn.reactos.org/svn/reactos?rev=56283&view=rev Log: [CMAKE] - include wincodec_i.c into uuid on MSVC builds - Improve midl support Modified: trunk/reactos/cmake/midl-support.cmake trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/lib/sdk/uuid/CMakeLists.txt Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Fri Mar 30 15:36:19 2012 @@ -25,9 +25,8 @@ get_defines(_defines) foreach(_idl_file ${ARGN}) get_filename_component(_name_we ${_idl_file} NAME_WE) - #set(_name ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}) add_custom_command( - OUTPUT ${_name_we}.h ${_name_we}_dummy_i.c + OUTPUT ${_name_we}.h COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}.h /iid ${_name_we}_dummy_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}) list(APPEND _target_dependencies ${_name_we}.h) @@ -38,15 +37,15 @@ function(add_rpcproxy_files) get_includes(_includes) get_defines(_defines) - set(_output_files "") + set(_chain_dependency "") foreach(_idl_file ${ARGN}) get_filename_component(_name_we ${_idl_file} NAME_WE) add_custom_command( OUTPUT ${_name_we}_p.c ${_name_we}_p.h proxy.dlldata.c COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /proxy ${_name_we}_p.c /h ${_name_we}_p.h /dlldata proxy.dlldata.c ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} ${_output_files}) - list(APPEND _output_files ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.c) - list(APPEND _output_files ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.h) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} ${_chain_dependency}) + list(APPEND _chain_dependency ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.c) + list(APPEND _chain_dependency ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.h) endforeach() set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) endfunction() @@ -64,16 +63,16 @@ else() message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files") endif() - foreach(FILE ${ARGN}) - get_filename_component(_name_we ${FILE} NAME_WE) - set(_name_we ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}${_suffix}) - if(NOT IS_ABSOLUTE ${FILE}) - set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + foreach(_idl_file ${ARGN}) + if(NOT IS_ABSOLUTE ${_idl_file}) + set(_idl_file ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}) endif() + get_filename_component(_name_we ${_idl_file} NAME_WE) + set(_name_we ${_name_we}${_suffix}) add_custom_command( OUTPUT ${_name_we}.c ${_name_we}.h - COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}.h ${_server_client} ${_name_we}.c ${FILE} - DEPENDS ${FILE}) + COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}.h ${_server_client} ${_name_we}.c ${_idl_file} + DEPENDS ${_idl_file}) endforeach() endfunction() @@ -81,8 +80,7 @@ get_includes(_includes) get_defines(_defines) - get_filename_component(_name ${_idl_file} NAME) - if(_name STREQUAL "${_idl_file}") + if(NOT IS_ABSOLUTE ${_idl_file}) set(_idl_file "${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}") endif() Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Fri Mar 30 15:36:19 2012 @@ -28,12 +28,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def) -if(MSVC) - set_source_files_properties(${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c PROPERTIES GENERATED TRUE) - list(APPEND SOURCE - ${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c) -endif() - add_library(gdiplus SHARED ${SOURCE}) set_module_type(gdiplus win32dll) target_link_libraries(gdiplus uuid wine) @@ -49,10 +43,4 @@ kernel32 ntdll) - - -if(ARCH MATCHES amd64) - target_link_libraries(gdiplus crt) -endif() - add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Fri Mar 30 15:36:19 2012 @@ -47,10 +47,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def) if(MSVC) - set_source_files_properties(${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c PROPERTIES GENERATED TRUE) - list(APPEND SOURCE - ${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c - msvc.S) + list(APPEND SOURCE msvc.S) endif() add_library(oleaut32 SHARED ${SOURCE}) Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Fri Mar 30 15:36:19 2012 @@ -41,12 +41,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) -if(MSVC) - set_source_files_properties(${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c PROPERTIES GENERATED TRUE) - list(APPEND SOURCE - ${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c) -endif() - add_library(windowscodecs SHARED ${SOURCE}) set_module_type(windowscodecs win32dll) Modified: trunk/reactos/lib/sdk/uuid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] Fri Mar 30 15:36:19 2012 @@ -169,6 +169,7 @@ tuner.idl vmr9.idl wia_xp.idl + wincodec.idl xmldom.idl xmldso.idl ctfutb.idl @@ -183,7 +184,6 @@ else() list(APPEND IDL_SOURCES wbemcli.idl - wincodec.idl wuapi.idl) endif()

1 0

[akhaldi] 56282: [CMAKE] * Make sure to pass the full path of the idl file in generate_idl_iids().
by akhaldi＠svn.reactos.org 29 Mar '12

29 Mar '12

Author: akhaldi Date: Thu Mar 29 23:08:39 2012 New Revision: 56282 URL: http://svn.reactos.org/svn/reactos?rev=56282&view=rev Log: [CMAKE] * Make sure to pass the full path of the idl file in generate_idl_iids(). Modified: trunk/reactos/cmake/midl-support.cmake Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Thu Mar 29 23:08:39 2012 @@ -82,9 +82,9 @@ get_defines(_defines) get_filename_component(_name ${_idl_file} NAME) - #if(_name STREQUAL "${_idl_file}") - # set(_idl_file "${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}") - #endif() + if(_name STREQUAL "${_idl_file}") + set(_idl_file "${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}") + endif() get_filename_component(_name_we ${_idl_file} NAME_WE) add_custom_command(

1 0

[tkreuzer] 56281: [CMAKE] Fix generation of _i.c iid files with midl. Simplify code, use better naming
by tkreuzer＠svn.reactos.org 29 Mar '12

29 Mar '12

Author: tkreuzer Date: Thu Mar 29 18:48:12 2012 New Revision: 56281 URL: http://svn.reactos.org/svn/reactos?rev=56281&view=rev Log: [CMAKE] Fix generation of _i.c iid files with midl. Simplify code, use better naming Modified: trunk/reactos/cmake/midl-support.cmake Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Thu Mar 29 18:48:12 2012 @@ -9,98 +9,102 @@ endif() function(add_typelib) - get_includes(INCLUDES) - get_defines(DEFINES) - foreach(FILE ${ARGN}) - get_filename_component(NAME ${FILE} NAME_WE) + get_includes(_includes) + get_defines(_defines) + foreach(_idl_file ${ARGN}) + get_filename_component(_name_we ${_idl_file} NAME_WE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb - COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /tlb ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + OUTPUT ${_name_we}.tlb + COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /tlb ${_name_we}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}) endforeach() endfunction() function(add_idl_headers TARGET) - get_includes(INCLUDES) - get_defines(DEFINES) - foreach(_input_file ${ARGN}) - get_filename_component(_name ${_input_file} NAME_WE) - set(_name ${CMAKE_CURRENT_BINARY_DIR}/${_name}) + get_includes(_includes) + get_defines(_defines) + foreach(_idl_file ${ARGN}) + get_filename_component(_name_we ${_idl_file} NAME_WE) + #set(_name ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}) add_custom_command( - OUTPUT ${_name}.h - COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /h ${_name}.h /iid ${_name}_dummy_i.h ${CMAKE_CURRENT_SOURCE_DIR}/${_input_file} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_input_file}) - list(APPEND _target_dependencies ${_name}.h) + OUTPUT ${_name_we}.h ${_name_we}_dummy_i.c + COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}.h /iid ${_name_we}_dummy_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}) + list(APPEND _target_dependencies ${_name_we}.h) endforeach() add_custom_target(${TARGET} DEPENDS ${_target_dependencies}) endfunction() function(add_rpcproxy_files) - get_includes(INCLUDES) - get_defines(DEFINES) - set(OUTPUT_FILES "") - foreach(FILE ${ARGN}) - get_filename_component(NAME ${FILE} NAME_WE) + get_includes(_includes) + get_defines(_defines) + set(_output_files "") + foreach(_idl_file ${ARGN}) + get_filename_component(_name_we ${_idl_file} NAME_WE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /proxy ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c /h ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${OUTPUT_FILES}) - list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) - list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h) + OUTPUT ${_name_we}_p.c ${_name_we}_p.h proxy.dlldata.c + COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /proxy ${_name_we}_p.c /h ${_name_we}_p.h /dlldata proxy.dlldata.c ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} ${_output_files}) + list(APPEND _output_files ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.c) + list(APPEND _output_files ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.h) endforeach() set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) endfunction() -function(add_rpc_files __type) - get_includes(INCLUDES) - get_defines(DEFINES) +function(add_rpc_files _type) + get_includes(_includes) + get_defines(_defines) # Is it a client or server module? - if(__type STREQUAL server) - set(__server_client /sstub) - set(__suffix _s) - elseif(__type STREQUAL client) - set(__server_client /cstub) - set(__suffix _c) + if(_type STREQUAL server) + set(_server_client /sstub) + set(_suffix _s) + elseif(_type STREQUAL client) + set(_server_client /cstub) + set(_suffix _c) else() message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files") endif() foreach(FILE ${ARGN}) - get_filename_component(__name ${FILE} NAME_WE) - set(__name ${CMAKE_CURRENT_BINARY_DIR}/${__name}${__suffix}) + get_filename_component(_name_we ${FILE} NAME_WE) + set(_name_we ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}${_suffix}) if(NOT IS_ABSOLUTE ${FILE}) set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endif() add_custom_command( - OUTPUT ${__name}.c ${__name}.h - COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /h ${__name}.h ${__server_client} ${__name}.c ${FILE} + OUTPUT ${_name_we}.c ${_name_we}.h + COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}.h ${_server_client} ${_name_we}.c ${FILE} DEPENDS ${FILE}) endforeach() endfunction() -function(generate_idl_iids IDL_FILE) - get_filename_component(FILE ${IDL_FILE} NAME) - if(FILE STREQUAL "${IDL_FILE}") - set(IDL_FILE_FULL "${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}") - else() - set(IDL_FILE_FULL ${IDL_FILE}) - endif() - get_includes(INCLUDES) - get_defines(DEFINES) - get_filename_component(NAME ${IDL_FILE} NAME_WE) +function(generate_idl_iids _idl_file) + get_includes(_includes) + get_defines(_defines) + + get_filename_component(_name ${_idl_file} NAME) + #if(_name STREQUAL "${_idl_file}") + # set(_idl_file "${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}") + #endif() + + get_filename_component(_name_we ${_idl_file} NAME_WE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c - COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /iid ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE_FULL} - DEPENDS ${IDL_FILE_FULL}) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE) + OUTPUT ${_name_we}_i.c ${_name_we}_i.h + COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}_i.h /iid ${_name_we}_i.c ${_idl_file} + DEPENDS ${_idl_file}) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_i.c PROPERTIES GENERATED TRUE) endfunction() -function(add_iid_library TARGET) - foreach(IDL_FILE ${ARGN}) - get_filename_component(NAME ${IDL_FILE} NAME_WE) - generate_idl_iids(${IDL_FILE}) - list(APPEND IID_SOURCES ${NAME}_i.c) +function(add_iid_library _target) + + foreach(_idl_file ${ARGN}) + generate_idl_iids(${_idl_file}) + get_filename_component(_name_we ${_idl_file} NAME_WE) + list(APPEND _iid_sources ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_i.c) endforeach() - add_library(${TARGET} ${IID_SOURCES}) - add_dependencies(${TARGET} psdk) - set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE) + add_library(${_target} ${_iid_sources}) + + # for wtypes.h + add_dependencies(${_target} psdk) + + set_target_properties(${_target} PROPERTIES EXCLUDE_FROM_ALL TRUE) endfunction()

1 0

[tkreuzer] 56280: [CMAKE] Attempt to fix a concurrency issue with midl. Regarding to the MSVC builder output, midl failed when compiling wine/itss.h due to a concurrent access to itss_i.c. Although...
by tkreuzer＠svn.reactos.org 29 Mar '12

29 Mar '12

Author: tkreuzer Date: Thu Mar 29 17:40:36 2012 New Revision: 56280 URL: http://svn.reactos.org/svn/reactos?rev=56280&view=rev Log: [CMAKE] Attempt to fix a concurrency issue with midl. Regarding to the MSVC builder output, midl failed when compiling wine/itss.h due to a concurrent access to itss_i.c. Although the command to generate itss.h doesn't seem to geenrate itss_i.c (at least not on my wdk buld), I added a switch to rename that file. Modified: trunk/reactos/cmake/midl-support.cmake Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Thu Mar 29 17:40:36 2012 @@ -23,16 +23,16 @@ function(add_idl_headers TARGET) get_includes(INCLUDES) get_defines(DEFINES) - foreach(FILE ${ARGN}) - get_filename_component(NAME ${FILE} NAME_WE) - set(HEADER ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h) + foreach(_input_file ${ARGN}) + get_filename_component(_name ${_input_file} NAME_WE) + set(_name ${CMAKE_CURRENT_BINARY_DIR}/${_name}) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h - COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - list(APPEND HEADERS ${HEADER}) + OUTPUT ${_name}.h + COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /h ${_name}.h /iid ${_name}_dummy_i.h ${CMAKE_CURRENT_SOURCE_DIR}/${_input_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_input_file}) + list(APPEND _target_dependencies ${_name}.h) endforeach() - add_custom_target(${TARGET} DEPENDS ${HEADERS}) + add_custom_target(${TARGET} DEPENDS ${_target_dependencies}) endfunction() function(add_rpcproxy_files)

1 0

[tkreuzer] 56279: [CMAKE] Cleanup *idl-support.cmake files a bit more
by tkreuzer＠svn.reactos.org 29 Mar '12

29 Mar '12

Author: tkreuzer Date: Thu Mar 29 15:57:55 2012 New Revision: 56279 URL: http://svn.reactos.org/svn/reactos?rev=56279&view=rev Log: [CMAKE] Cleanup *idl-support.cmake files a bit more Modified: trunk/reactos/cmake/midl-support.cmake trunk/reactos/cmake/widl-support.cmake Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Thu Mar 29 15:57:55 2012 @@ -1,21 +1,12 @@ #idl files support - 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 "") +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() function(add_typelib) get_includes(INCLUDES) @@ -24,9 +15,8 @@ get_filename_component(NAME ${FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) - list(APPEND OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb) + COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /tlb ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endforeach() endfunction() @@ -38,8 +28,8 @@ set(HEADER ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) + COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /h ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) list(APPEND HEADERS ${HEADER}) endforeach() add_custom_target(${TARGET} DEPENDS ${HEADERS}) @@ -48,38 +38,17 @@ function(add_rpcproxy_files) get_includes(INCLUDES) get_defines(DEFINES) - - if(MSVC) - set(DLLDATA_ARG /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c) - set(OUTPUT_FILES "") - endif() + set(OUTPUT_FILES "") foreach(FILE ${ARGN}) get_filename_component(NAME ${FILE} NAME_WE) - if(MSVC) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /proxy ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c /h ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${OUTPUT_FILES}) - list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) - list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h) - else() - list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -h -H ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} native-widl) - endif() + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /proxy ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c /h ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${OUTPUT_FILES}) + list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) + list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h) endforeach() - - # Extra pass to generate dlldata - if(MSVC) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) - else() - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} --dlldata-only -o ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${IDLS} - DEPENDS ${IDLS} ${IDL_DEPENDS}) - endif() + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) endfunction() function(add_rpc_files __type) @@ -87,24 +56,24 @@ get_defines(DEFINES) # Is it a client or server module? if(__type STREQUAL server) - set(__server_client ${IDL_SERVER_ARG}) + set(__server_client /sstub) set(__suffix _s) elseif(__type STREQUAL client) - set(__server_client ${IDL_CLIENT_ARG}) + set(__server_client /cstub) set(__suffix _c) else() message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files") endif() foreach(FILE ${ARGN}) get_filename_component(__name ${FILE} NAME_WE) - set(__name ${__name}${__suffix}) + set(__name ${CMAKE_CURRENT_BINARY_DIR}/${__name}${__suffix}) if(NOT IS_ABSOLUTE ${FILE}) set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endif() add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE} - DEPENDS ${FILE} ${IDL_DEPENDS}) + OUTPUT ${__name}.c ${__name}.h + COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /h ${__name}.h ${__server_client} ${__name}.c ${FILE} + DEPENDS ${FILE}) endforeach() endfunction() @@ -120,8 +89,8 @@ get_filename_component(NAME ${IDL_FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_INTERFACE_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE_FULL} - DEPENDS ${IDL_FILE_FULL} ${IDL_DEPENDS}) + COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /iid ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE_FULL} + DEPENDS ${IDL_FILE_FULL}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE) endfunction() Modified: trunk/reactos/cmake/widl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/widl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/widl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/widl-support.cmake [iso-8859-1] Thu Mar 29 15:57:55 2012 @@ -1,21 +1,12 @@ #idl files support - 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) +if(ARCH MATCHES i386) + set(IDL_FLAGS -m32 --win32) +elseif(ARCH MATCHES amd64) + set(IDL_FLAGS -m64 --win64) +else() + set(IDL_FLAGS "") +endif() function(add_typelib) get_includes(INCLUDES) @@ -24,8 +15,8 @@ get_filename_component(NAME ${FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -t -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} native-widl) list(APPEND OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb) endforeach() endfunction() @@ -38,8 +29,8 @@ set(HEADER ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -h -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} native-widl) list(APPEND HEADERS ${HEADER}) endforeach() add_custom_target(${TARGET} DEPENDS ${HEADERS}) @@ -49,37 +40,20 @@ get_includes(INCLUDES) get_defines(DEFINES) - if(MSVC) - set(DLLDATA_ARG /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c) - set(OUTPUT_FILES "") - endif() foreach(FILE ${ARGN}) get_filename_component(NAME ${FILE} NAME_WE) - if(MSVC) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /proxy ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c /h ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${OUTPUT_FILES}) - list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) - list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h) - else() list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -h -H ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} native-widl) - endif() endforeach() # Extra pass to generate dlldata - if(MSVC) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) - else() - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} --dlldata-only -o ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${IDLS} - DEPENDS ${IDLS} ${IDL_DEPENDS}) - endif() + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} --dlldata-only -o ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${IDLS} + DEPENDS ${IDLS} native-widl) endfunction() function(add_rpc_files __type) @@ -87,24 +61,24 @@ get_defines(DEFINES) # Is it a client or server module? if(__type STREQUAL server) - set(__server_client ${IDL_SERVER_ARG}) + set(__server_client -Oif -s -o) set(__suffix _s) elseif(__type STREQUAL client) - set(__server_client ${IDL_CLIENT_ARG}) + set(__server_client -Oif -c -o) set(__suffix _c) else() message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files") endif() foreach(FILE ${ARGN}) get_filename_component(__name ${FILE} NAME_WE) - set(__name ${__name}${__suffix}) + set(__name ${CMAKE_CURRENT_BINARY_DIR}/${__name}${__suffix}) if(NOT IS_ABSOLUTE ${FILE}) set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endif() add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE} - DEPENDS ${FILE} ${IDL_DEPENDS}) + OUTPUT ${__name}.c ${__name}.h + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -h -H ${__name}.h ${__server_client} ${__name}.c ${FILE} + DEPENDS ${FILE} native-widl) endforeach() endfunction() @@ -120,8 +94,8 @@ get_filename_component(NAME ${IDL_FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_INTERFACE_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE_FULL} - DEPENDS ${IDL_FILE_FULL} ${IDL_DEPENDS}) + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -u -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE_FULL} + DEPENDS ${IDL_FILE_FULL} native-widl) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE) endfunction()

1 0

[tkreuzer] 56278: [CMAKE] Move common macros from *idl-support.cmake to CMakeMacros.cmake, remove obsolete definitions
by tkreuzer＠svn.reactos.org 29 Mar '12

29 Mar '12

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?re… ============================================================================== --- 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?r… ============================================================================== --- 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?r… ============================================================================== --- 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)

1 0

[tkreuzer] 56277: [CMAKE] Seperate midl and widl files (currently files are simply copied)
by tkreuzer＠svn.reactos.org 29 Mar '12

29 Mar '12

Author: tkreuzer Date: Thu Mar 29 14:45:46 2012 New Revision: 56277 URL: http://svn.reactos.org/svn/reactos?rev=56277&view=rev Log: [CMAKE] Seperate midl and widl files (currently files are simply copied) Added: trunk/reactos/cmake/midl-support.cmake - copied unchanged from r56276, trunk/reactos/cmake/idl-support.cmake trunk/reactos/cmake/widl-support.cmake - copied unchanged from r56276, trunk/reactos/cmake/idl-support.cmake Removed: trunk/reactos/cmake/idl-support.cmake Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=56277&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Mar 29 14:45:46 2012 @@ -77,10 +77,10 @@ #useful stuff! include(CMakeParseArguments) - + # this is needed as well link_directories(${REACTOS_SOURCE_DIR}/importlibs) - + if(ENABLE_CCACHE) set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF) set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF) @@ -142,7 +142,7 @@ elseif(ARCH MATCHES arm) add_definitions(-DUSE_COMPILER_EXCEPTIONS) endif() - + # Activate support for assembly source files enable_language(ASM) @@ -166,7 +166,11 @@ include(cmake/CMakeMacros.cmake) # IDL macros for widl/midl - include(cmake/idl-support.cmake) + if (MSVC) + include(cmake/midl-support.cmake) + else() + include(cmake/widl-support.cmake) + endif() if(MSVC AND USE_WDK_HEADERS) include_directories( @@ -197,7 +201,7 @@ include/reactos include/reactos/libs) endif() - + if(ARCH MATCHES arm) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm) Removed: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake (removed) @@ -1,173 +1,0 @@ - -#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 - 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) - get_defines(DEFINES) - foreach(FILE ${ARGN}) - get_filename_component(NAME ${FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) - list(APPEND OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb) - endforeach() -endfunction() - -function(add_idl_headers TARGET) - get_includes(INCLUDES) - get_defines(DEFINES) - foreach(FILE ${ARGN}) - get_filename_component(NAME ${FILE} NAME_WE) - set(HEADER ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) - list(APPEND HEADERS ${HEADER}) - endforeach() - add_custom_target(${TARGET} DEPENDS ${HEADERS}) -endfunction() - -function(add_rpcproxy_files) - get_includes(INCLUDES) - get_defines(DEFINES) - - if(MSVC) - set(DLLDATA_ARG /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c) - set(OUTPUT_FILES "") - endif() - foreach(FILE ${ARGN}) - get_filename_component(NAME ${FILE} NAME_WE) - if(MSVC) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /proxy ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c /h ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${OUTPUT_FILES}) - list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) - list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h) - else() - list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -h -H ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} native-widl) - endif() - endforeach() - - # Extra pass to generate dlldata - if(MSVC) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) - else() - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} --dlldata-only -o ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${IDLS} - DEPENDS ${IDLS} ${IDL_DEPENDS}) - endif() -endfunction() - -function(add_rpc_files __type) - get_includes(INCLUDES) - get_defines(DEFINES) - # Is it a client or server module? - if(__type STREQUAL server) - set(__server_client ${IDL_SERVER_ARG}) - set(__suffix _s) - elseif(__type STREQUAL client) - set(__server_client ${IDL_CLIENT_ARG}) - set(__suffix _c) - else() - message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files") - endif() - foreach(FILE ${ARGN}) - get_filename_component(__name ${FILE} NAME_WE) - set(__name ${__name}${__suffix}) - if(NOT IS_ABSOLUTE ${FILE}) - set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - endif() - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE} - DEPENDS ${FILE} ${IDL_DEPENDS}) - endforeach() -endfunction() - -function(generate_idl_iids IDL_FILE) - get_filename_component(FILE ${IDL_FILE} NAME) - if(FILE STREQUAL "${IDL_FILE}") - set(IDL_FILE_FULL "${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}") - else() - set(IDL_FILE_FULL ${IDL_FILE}) - endif() - get_includes(INCLUDES) - get_defines(DEFINES) - get_filename_component(NAME ${IDL_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_INTERFACE_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE_FULL} - DEPENDS ${IDL_FILE_FULL} ${IDL_DEPENDS}) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE) -endfunction() - -function(add_iid_library TARGET) - foreach(IDL_FILE ${ARGN}) - get_filename_component(NAME ${IDL_FILE} NAME_WE) - generate_idl_iids(${IDL_FILE}) - list(APPEND IID_SOURCES ${NAME}_i.c) - endforeach() - add_library(${TARGET} ${IID_SOURCES}) - add_dependencies(${TARGET} psdk) - set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE) -endfunction()

1 0

[cgutman] 56276: [INF] - Change the device description for bluetooth devices
by cgutman＠svn.reactos.org 29 Mar '12

29 Mar '12

Author: cgutman Date: Thu Mar 29 14:33:42 2012 New Revision: 56276 URL: http://svn.reactos.org/svn/reactos?rev=56276&view=rev Log: [INF] - Change the device description for bluetooth devices Modified: trunk/reactos/media/inf/bth.inf Modified: trunk/reactos/media/inf/bth.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bth.inf?rev=5627… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 56275: [CMAKE] * Pass /no_def_idir to midl, to search only in the include folders that we specify (through /I).
by akhaldi＠svn.reactos.org 29 Mar '12

29 Mar '12

Author: akhaldi Date: Thu Mar 29 13:24:26 2012 New Revision: 56275 URL: http://svn.reactos.org/svn/reactos?rev=56275&view=rev Log: [CMAKE] * Pass /no_def_idir to midl, to search only in the include folders that we specify (through /I). Modified: trunk/reactos/cmake/idl-support.cmake Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Thu Mar 29 13:24:26 2012 @@ -10,11 +10,11 @@ set(IDL_PROXY_ARG /proxy) set(IDL_INTERFACE_ARG /iid) if(ARCH MATCHES i386) - set(IDL_FLAGS /nologo /win32) + set(IDL_FLAGS /nologo /win32 /no_def_idir) elseif(ARCH MATCHES amd64) - set(IDL_FLAGS /nologo /amd64) + set(IDL_FLAGS /nologo /amd64 /no_def_idir) else() - set(IDL_FLAGS /nologo) + set(IDL_FLAGS /nologo /no_def_idir) endif() set(IDL_DEPENDS "") else()

1 0

[tkreuzer] 56274: [CMAKE] Try to fix some midl dependency and concurrency issues
by tkreuzer＠svn.reactos.org 29 Mar '12

29 Mar '12

Author: tkreuzer Date: Thu Mar 29 13:07:08 2012 New Revision: 56274 URL: http://svn.reactos.org/svn/reactos?rev=56274&view=rev Log: [CMAKE] Try to fix some midl dependency and concurrency issues Modified: trunk/reactos/cmake/idl-support.cmake Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Thu Mar 29 13:07:08 2012 @@ -87,28 +87,28 @@ if(MSVC) set(DLLDATA_ARG /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c) - set(DLLDATA_DEPENDENCIES "") + set(OUTPUT_FILES "") endif() foreach(FILE ${ARGN}) get_filename_component(NAME ${FILE} NAME_WE) if(MSVC) - set(DLLDATA_DEPENDENCIES ${DLLDATA_DEPENDENCIES} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /proxy ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c /h ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${OUTPUT_FILES}) + list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) + list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h) else() list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -h -H ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} native-widl) endif() - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_PROXY_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${IDL_HEADER_ARG2} ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${DLLDATA_ARG} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) endforeach() # Extra pass to generate dlldata if(MSVC) - #touch it, so we're sure it's older than its dependencies - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - DEPENDS ${DLLDATA_DEPENDENCIES}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) else() add_custom_command(

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs