Fix generation of _i.c iid files with midl. Simplify code, use better naming

svn path=/trunk/; revision=56281
This commit is contained in:
Timo Kreuzer 2012-03-29 18:48:12 +00:00
parent fa6ae5c35c
commit cf7dd9d21a

View file

@ -9,98 +9,102 @@ else()
endif() endif()
function(add_typelib) function(add_typelib)
get_includes(INCLUDES) get_includes(_includes)
get_defines(DEFINES) get_defines(_defines)
foreach(FILE ${ARGN}) foreach(_idl_file ${ARGN})
get_filename_component(NAME ${FILE} NAME_WE) get_filename_component(_name_we ${_idl_file} NAME_WE)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb OUTPUT ${_name_we}.tlb
COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /tlb ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /tlb ${_name_we}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file})
endforeach() endforeach()
endfunction() endfunction()
function(add_idl_headers TARGET) function(add_idl_headers TARGET)
get_includes(INCLUDES) get_includes(_includes)
get_defines(DEFINES) get_defines(_defines)
foreach(_input_file ${ARGN}) foreach(_idl_file ${ARGN})
get_filename_component(_name ${_input_file} NAME_WE) get_filename_component(_name_we ${_idl_file} NAME_WE)
set(_name ${CMAKE_CURRENT_BINARY_DIR}/${_name}) #set(_name ${CMAKE_CURRENT_BINARY_DIR}/${_name_we})
add_custom_command( add_custom_command(
OUTPUT ${_name}.h OUTPUT ${_name_we}.h ${_name_we}_dummy_i.c
COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /h ${_name}.h /iid ${_name}_dummy_i.h ${CMAKE_CURRENT_SOURCE_DIR}/${_input_file} 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}/${_input_file}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file})
list(APPEND _target_dependencies ${_name}.h) list(APPEND _target_dependencies ${_name_we}.h)
endforeach() endforeach()
add_custom_target(${TARGET} DEPENDS ${_target_dependencies}) add_custom_target(${TARGET} DEPENDS ${_target_dependencies})
endfunction() endfunction()
function(add_rpcproxy_files) function(add_rpcproxy_files)
get_includes(INCLUDES) get_includes(_includes)
get_defines(DEFINES) get_defines(_defines)
set(OUTPUT_FILES "") set(_output_files "")
foreach(FILE ${ARGN}) foreach(_idl_file ${ARGN})
get_filename_component(NAME ${FILE} NAME_WE) get_filename_component(_name_we ${_idl_file} NAME_WE)
add_custom_command( 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 OUTPUT ${_name_we}_p.c ${_name_we}_p.h 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 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}/${FILE} ${OUTPUT_FILES}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} ${_output_files})
list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c) list(APPEND _output_files ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.c)
list(APPEND OUTPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h) list(APPEND _output_files ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.h)
endforeach() endforeach()
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE)
endfunction() endfunction()
function(add_rpc_files __type) function(add_rpc_files _type)
get_includes(INCLUDES) get_includes(_includes)
get_defines(DEFINES) get_defines(_defines)
# Is it a client or server module? # Is it a client or server module?
if(__type STREQUAL server) if(_type STREQUAL server)
set(__server_client /sstub) set(_server_client /sstub)
set(__suffix _s) set(_suffix _s)
elseif(__type STREQUAL client) elseif(_type STREQUAL client)
set(__server_client /cstub) set(_server_client /cstub)
set(__suffix _c) set(_suffix _c)
else() else()
message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files") message(FATAL_ERROR "Please pass either server or client as argument to add_rpc_files")
endif() endif()
foreach(FILE ${ARGN}) foreach(FILE ${ARGN})
get_filename_component(__name ${FILE} NAME_WE) get_filename_component(_name_we ${FILE} NAME_WE)
set(__name ${CMAKE_CURRENT_BINARY_DIR}/${__name}${__suffix}) set(_name_we ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}${_suffix})
if(NOT IS_ABSOLUTE ${FILE}) if(NOT IS_ABSOLUTE ${FILE})
set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
endif() endif()
add_custom_command( add_custom_command(
OUTPUT ${__name}.c ${__name}.h OUTPUT ${_name_we}.c ${_name_we}.h
COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /h ${__name}.h ${__server_client} ${__name}.c ${FILE} COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}.h ${_server_client} ${_name_we}.c ${FILE}
DEPENDS ${FILE}) DEPENDS ${FILE})
endforeach() endforeach()
endfunction() endfunction()
function(generate_idl_iids IDL_FILE) function(generate_idl_iids _idl_file)
get_filename_component(FILE ${IDL_FILE} NAME) get_includes(_includes)
if(FILE STREQUAL "${IDL_FILE}") get_defines(_defines)
set(IDL_FILE_FULL "${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}")
else() get_filename_component(_name ${_idl_file} NAME)
set(IDL_FILE_FULL ${IDL_FILE}) #if(_name STREQUAL "${_idl_file}")
endif() # set(_idl_file "${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}")
get_includes(INCLUDES) #endif()
get_defines(DEFINES)
get_filename_component(NAME ${IDL_FILE} NAME_WE) get_filename_component(_name_we ${_idl_file} NAME_WE)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c OUTPUT ${_name_we}_i.c ${_name_we}_i.h
COMMAND midl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} /iid ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c ${IDL_FILE_FULL} COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /h ${_name_we}_i.h /iid ${_name_we}_i.c ${_idl_file}
DEPENDS ${IDL_FILE_FULL}) DEPENDS ${_idl_file})
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_i.c PROPERTIES GENERATED TRUE)
endfunction() endfunction()
function(add_iid_library TARGET) function(add_iid_library _target)
foreach(IDL_FILE ${ARGN})
get_filename_component(NAME ${IDL_FILE} NAME_WE) foreach(_idl_file ${ARGN})
generate_idl_iids(${IDL_FILE}) generate_idl_iids(${_idl_file})
list(APPEND IID_SOURCES ${NAME}_i.c) get_filename_component(_name_we ${_idl_file} NAME_WE)
list(APPEND _iid_sources ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_i.c)
endforeach() endforeach()
add_library(${TARGET} ${IID_SOURCES}) add_library(${_target} ${_iid_sources})
add_dependencies(${TARGET} psdk)
set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE) # for wtypes.h
add_dependencies(${_target} psdk)
set_target_properties(${_target} PROPERTIES EXCLUDE_FROM_ALL TRUE)
endfunction() endfunction()