else()
set(IDL_FLAGS "")
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 -s -o) #.c for server library
- set(IDL_CLIENT_ARG -c -o) #.c for stub client library
+ 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)
else()
set(IDL_FLAGS "")
endif()
+ set(IDL_DEPENDS native-widl)
endif()
-macro(get_includes OUTPUT_VAR)
- set(${OUTPUT_VAR} "")
+function(get_includes OUTPUT_VAR)
get_directory_property(_includes INCLUDE_DIRECTORIES)
foreach(arg ${_includes})
- set(${OUTPUT_VAR} -I${arg} ${${OUTPUT_VAR}})
+ list(APPEND __tmp_var -I${arg})
endforeach()
-endmacro()
+ set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE)
+endfunction()
-macro(get_defines OUTPUT_VAR)
- set(${OUTPUT_VAR} "")
+function(get_defines OUTPUT_VAR)
get_directory_property(_defines COMPILE_DEFINITIONS)
foreach(arg ${_defines})
- set(${OUTPUT_VAR} ${${OUTPUT_VAR}} -D${arg})
+ list(APPEND __tmp_var -D${arg})
endforeach()
-endmacro()
+ set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE)
+endfunction()
-macro(add_typelib TARGET)
+function(add_typelib TARGET)
get_includes(INCLUDES)
get_defines(DEFINES)
foreach(FILE ${ARGN})
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})
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS})
list(APPEND OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb)
endforeach()
add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})
-endmacro()
+endfunction()
-macro(add_idl_headers TARGET)
+function(add_idl_headers TARGET)
get_includes(INCLUDES)
get_defines(DEFINES)
foreach(FILE ${ARGN})
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})
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS})
list(APPEND HEADERS ${HEADER})
endforeach()
- add_custom_target(${TARGET} ALL DEPENDS ${HEADERS})
-endmacro()
+ add_custom_target(${TARGET} DEPENDS ${HEADERS})
+endfunction()
-macro(add_rpcproxy_files)
+function(add_rpcproxy_files)
get_includes(INCLUDES)
get_defines(DEFINES)
if(MSVC)
set(DLLDATA_ARG /dlldata ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c)
+ set(DLLDATA_DEPENDENCIES "")
endif()
foreach(FILE ${ARGN})
get_filename_component(NAME ${FILE} NAME_WE)
- if(NOT MSVC)
+ if(MSVC)
+ set(DLLDATA_DEPENDENCIES ${DLLDATA_DEPENDENCIES} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c)
+ else()
list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
endif()
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${NAME}_p.h
+ 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})
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS})
endforeach()
# Extra pass to generate dlldata
if(MSVC)
- #nobody told how to generate it, so mark it as generated
+ #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(
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})
+ DEPENDS ${IDLS} ${IDL_DEPENDS})
endif()
-endmacro()
+endfunction()
-macro(add_rpc_library TARGET)
+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)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h
- COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
- list(APPEND server_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c)
-
+ 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.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h
- COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
- list(APPEND client_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c)
+ 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()
- add_library(${TARGET} ${client_SOURCES} ${server_SOURCES})
- add_dependencies(${TARGET} psdk)
-endmacro()
+endfunction()
-macro(generate_idl_iids IDL_FILE)
+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}")
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})
+ DEPENDS ${IDL_FILE_FULL} ${IDL_DEPENDS})
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${NAME}_i.c PROPERTIES GENERATED TRUE)
-endmacro()
+endfunction()
-macro(add_iid_library TARGET)
+function(add_iid_library TARGET)
foreach(IDL_FILE ${ARGN})
get_filename_component(NAME ${IDL_FILE} NAME_WE)
generate_idl_iids(${IDL_FILE})
endforeach()
add_library(${TARGET} ${IID_SOURCES})
add_dependencies(${TARGET} psdk)
-endmacro()
+ set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+endfunction()