[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 24 Dec 2010 13:38:27 +0000 (13:38 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 24 Dec 2010 13:38:27 +0000 (13:38 +0000)
- Improve formatting, mainly the uppercase macro names. No functionality change.

svn path=/branches/cmake-bringup/; revision=50124

15 files changed:
CMakeMacros.cmake
dll/win32/atl/CMakeLists.txt
dll/win32/jscript/CMakeLists.txt
dll/win32/mshtml.tlb/CMakeLists.txt
dll/win32/mshtml/CMakeLists.txt
dll/win32/msxml3/CMakeLists.txt
dll/win32/ole32/CMakeLists.txt
dll/win32/pstorec/CMakeLists.txt
dll/win32/shdocvw/CMakeLists.txt
dll/win32/stdole2.tlb/CMakeLists.txt
dll/win32/stdole32.tlb/CMakeLists.txt
include/dxsdk/CMakeLists.txt
include/psdk/CMakeLists.txt
include/reactos/idl/CMakeLists.txt
include/reactos/wine/CMakeLists.txt

index ff7b827..cda06dd 100644 (file)
@@ -1,8 +1,7 @@
 \r
-\r
 if (NOT MSVC)\r
-MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r
 \r
+macro(CreateBootSectorTarget _target_name _asm_file _object_file)\r
     get_filename_component(OBJECT_PATH ${_object_file} PATH)\r
     get_filename_component(OBJECT_NAME ${_object_file} NAME)\r
     file(MAKE_DIRECTORY ${OBJECT_PATH})\r
@@ -11,11 +10,11 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
 \r
     foreach(arg ${defines})\r
         set(result_defs ${result_defs} -D${arg})\r
-    endforeach(arg ${defines})\r
+    endforeach()\r
 \r
     foreach(arg ${includes})\r
         set(result_incs -I${arg} ${result_incs})\r
-    endforeach(arg ${includes})\r
+    endforeach()\r
 \r
     add_custom_command(\r
         OUTPUT ${_object_file}\r
@@ -24,88 +23,91 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
     set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)\r
     add_custom_target(${_target_name} ALL DEPENDS ${_object_file})\r
     add_minicd(${_object_file} loader ${OBJECT_NAME})\r
-ENDMACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r
+endmacro()\r
+\r
 else()\r
-MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r
-ENDMACRO()\r
+\r
+macro(CreateBootSectorTarget _target_name _asm_file _object_file)\r
+endmacro()\r
+\r
 endif()\r
 \r
-MACRO(MACRO_IDL_COMPILE_OBJECT OBJECT SOURCE)\r
-  GET_PROPERTY(FLAGS SOURCE ${SOURCE} PROPERTY COMPILE_FLAGS)\r
-  GET_PROPERTY(DEFINES SOURCE ${SOURCE} PROPERTY COMPILE_DEFINITIONS)\r
-  GET_PROPERTY(INCLUDE_DIRECTORIES DIRECTORY PROPERTY INCLUDE_DIRECTORIES)\r
-  FOREACH(DIR ${INCLUDE_DIRECTORIES})\r
-    SET(FLAGS "${FLAGS} -I${DIR}")\r
-  ENDFOREACH()\r
-\r
-  SET(IDL_COMMAND ${CMAKE_IDL_COMPILE_OBJECT})\r
-  STRING(REPLACE "<CMAKE_IDL_COMPILER>" "${CMAKE_IDL_COMPILER}" IDL_COMMAND "${IDL_COMMAND}")\r
-  STRING(REPLACE <FLAGS> "${FLAGS}" IDL_COMMAND "${IDL_COMMAND}")\r
-  STRING(REPLACE "<DEFINES>" "${DEFINES}" IDL_COMMAND "${IDL_COMMAND}")\r
-  STRING(REPLACE "<OBJECT>" "${OBJECT}" IDL_COMMAND "${IDL_COMMAND}")\r
-  STRING(REPLACE "<SOURCE>" "${SOURCE}" IDL_COMMAND "${IDL_COMMAND}")\r
-  SEPARATE_ARGUMENTS(IDL_COMMAND)\r
-\r
-  ADD_CUSTOM_COMMAND(\r
-    OUTPUT ${OBJECT}\r
-    COMMAND ${IDL_COMMAND}\r
-    DEPENDS ${SOURCE}\r
-    VERBATIM\r
-  )\r
-ENDMACRO()\r
-\r
-MACRO(ADD_INTERFACE_DEFINITIONS TARGET)\r
-  FOREACH(SOURCE ${ARGN})\r
-    GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE)\r
-    SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h)\r
-    MACRO_IDL_COMPILE_OBJECT(${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE})\r
-    LIST(APPEND OBJECTS ${OBJECT})\r
-  ENDFOREACH()\r
-  ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS})\r
-ENDMACRO()\r
-\r
-MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd\r
+macro(idl_compile_object OBJECT SOURCE)\r
+    get_property(FLAGS SOURCE ${SOURCE} PROPERTY COMPILE_FLAGS)\r
+    get_property(DEFINES SOURCE ${SOURCE} PROPERTY COMPILE_DEFINITIONS)\r
+    get_property(INCLUDE_DIRECTORIES DIRECTORY PROPERTY INCLUDE_DIRECTORIES)\r
+  \r
+    foreach(DIR ${INCLUDE_DIRECTORIES})\r
+        set(FLAGS "${FLAGS} -I${DIR}")\r
+    endforeach()\r
+\r
+    set(IDL_COMMAND ${CMAKE_IDL_COMPILE_OBJECT})\r
+    string(REPLACE "<CMAKE_IDL_COMPILER>" "${CMAKE_IDL_COMPILER}" IDL_COMMAND "${IDL_COMMAND}")\r
+    string(REPLACE <FLAGS> "${FLAGS}" IDL_COMMAND "${IDL_COMMAND}")\r
+    string(REPLACE "<DEFINES>" "${DEFINES}" IDL_COMMAND "${IDL_COMMAND}")\r
+    string(REPLACE "<OBJECT>" "${OBJECT}" IDL_COMMAND "${IDL_COMMAND}")\r
+    string(REPLACE "<SOURCE>" "${SOURCE}" IDL_COMMAND "${IDL_COMMAND}")\r
+    separate_arguments(IDL_COMMAND)\r
+\r
+    add_custom_command(\r
+        OUTPUT ${OBJECT}\r
+        COMMAND ${IDL_COMMAND}\r
+        DEPENDS ${SOURCE}\r
+        VERBATIM)\r
+endmacro()\r
+\r
+macro(add_interface_definitions TARGET)\r
+    foreach(SOURCE ${ARGN})\r
+        get_filename_component(FILE ${SOURCE} NAME_WE)\r
+        set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h)\r
+        idl_compile_object(${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE})\r
+        list(APPEND OBJECTS ${OBJECT})\r
+    endforeach()\r
+    add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})\r
+endmacro()\r
+\r
+macro(add_minicd_target _targetname _dir) # optional parameter: _nameoncd\r
     if("${ARGN}" STREQUAL "")\r
         get_target_property(FILENAME ${_targetname} LOCATION)\r
-       get_filename_component(_nameoncd ${FILENAME} NAME)\r
+        get_filename_component(_nameoncd ${FILENAME} NAME)\r
     else()\r
-       set(_nameoncd ${ARGN})\r
+        set(_nameoncd ${ARGN})\r
     endif()\r
     \r
     file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")\r
-ENDMACRO(add_minicd_target)\r
+endmacro()\r
 \r
-MACRO(add_minicd FILENAME _dir _nameoncd)\r
+macro(add_minicd FILENAME _dir _nameoncd)\r
     file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")\r
-ENDMACRO(add_minicd)\r
+endmacro()\r
 \r
 macro(set_cpp)\r
-  include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)\r
-  set(IS_CPP 1)\r
-  add_definitions(\r
-    -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++\r
-    -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)\r
+    include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)\r
+    set(IS_CPP 1)\r
+    add_definitions(\r
+        -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++\r
+        -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)\r
 endmacro()\r
 \r
-MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd\r
+macro(add_livecd_target _targetname _dir )# optional parameter : _nameoncd\r
     if("${ARGN}" STREQUAL "")\r
         get_target_property(FILENAME ${_targetname} LOCATION)\r
-       get_filename_component(_nameoncd ${FILENAME} NAME)\r
+        get_filename_component(_nameoncd ${FILENAME} NAME)\r
     else()\r
-       set(_nameoncd ${ARGN})\r
+        set(_nameoncd ${ARGN})\r
     endif()\r
     \r
     file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")\r
-ENDMACRO(add_livecd_target)\r
+endmacro()\r
 \r
-MACRO(add_livecd FILENAME _dir)# optional parameter : _nameoncd\r
+macro(add_livecd FILENAME _dir)# optional parameter : _nameoncd\r
     if("${ARGN}" STREQUAL "")\r
-       get_filename_component(_nameoncd ${FILENAME} NAME)\r
+        get_filename_component(_nameoncd ${FILENAME} NAME)\r
     else()\r
-       set(_nameoncd ${ARGN})\r
+        set(_nameoncd ${ARGN})\r
     endif()\r
     file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")\r
-ENDMACRO(add_livecd)\r
+endmacro()\r
 \r
 macro(cab_to_dir _dir_num _var_name)\r
 #   1 = system32\r
@@ -137,17 +139,17 @@ macro(cab_to_dir _dir_num _var_name)
     endif()\r
 endmacro()\r
 \r
-MACRO(add_cab_target _targetname _num )\r
+macro(add_cab_target _targetname _num )\r
     file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n")\r
     cab_to_dir(${_num} _dir)\r
     add_livecd_target(${_targetname} ${_dir})\r
-ENDMACRO(add_cab_target)\r
+endmacro()\r
 \r
-MACRO(add_cab FILENAME _num)\r
+macro(add_cab FILENAME _num)\r
     file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n")\r
     cab_to_dir(${_num} _dir)\r
     add_livecd(${FILENAME} ${_dir})\r
-ENDMACRO(add_cab)    \r
+endmacro()    \r
 \r
 macro(custom_incdefs)\r
     if(NOT DEFINED result_incs) #rpc_defines\r
@@ -156,17 +158,17 @@ macro(custom_incdefs)
 \r
         foreach(arg ${rpc_defines})\r
             set(result_defs ${result_defs} -D${arg})\r
-        endforeach(arg ${defines})\r
+        endforeach()\r
 \r
         foreach(arg ${rpc_includes})\r
             set(result_incs -I${arg} ${result_incs})\r
-        endforeach(arg ${includes})\r
+        endforeach()\r
     endif()\r
-endmacro(custom_incdefs)\r
+endmacro()\r
 \r
 macro(rpcproxy TARGET)\r
     custom_incdefs()\r
-        list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c)\r
+    list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c)\r
 \r
     foreach(_in_FILE ${ARGN})\r
         get_filename_component(FILE ${_in_FILE} NAME_WE)\r
@@ -183,7 +185,7 @@ macro(rpcproxy TARGET)
         add_custom_target(${TARGET}_${FILE}_p \r
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)\r
         #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p)\r
-    endforeach(_in_FILE ${ARGN})\r
+    endforeach()\r
 \r
     add_custom_command(\r
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c\r
@@ -195,9 +197,9 @@ macro(rpcproxy TARGET)
     \r
     add_library(${TARGET}_proxy ${SOURCE})\r
     add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS})\r
-endmacro(rpcproxy)\r
+endmacro()\r
 \r
-macro (MACRO_IDL_FILES)\r
+macro(idl_files)\r
     custom_incdefs()\r
     foreach(_in_FILE ${ARGN})\r
         get_filename_component(FILE ${_in_FILE} NAME_WE)\r
@@ -220,28 +222,29 @@ macro (MACRO_IDL_FILES)
             PROPERTIES GENERATED TRUE)\r
         add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c)\r
         add_dependencies(${FILE}_client psdk)\r
-    endforeach(_in_FILE ${ARGN})\r
-\r
-endmacro (MACRO_IDL_FILES)\r
+    endforeach()\r
+endmacro()\r
 \r
-macro(ADD_TYPELIB TARGET)\r
-  custom_incdefs()\r
-  foreach(SOURCE ${ARGN})\r
-    get_filename_component(FILE ${SOURCE} NAME_WE)\r
-    set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)\r
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb\r
-                       COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}\r
-                       DEPENDS ${SOURCE})\r
-    list(APPEND OBJECTS ${OBJECT})\r
-  endforeach()\r
-  add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})\r
+macro(add_typelib TARGET)\r
+    custom_incdefs()\r
+    foreach(SOURCE ${ARGN})\r
+        get_filename_component(FILE ${SOURCE} NAME_WE)\r
+        set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)\r
+        add_custom_command(\r
+            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb\r
+            COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}\r
+            DEPENDS ${SOURCE})\r
+        list(APPEND OBJECTS ${OBJECT})\r
+    endforeach()\r
+    add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})\r
 endmacro()\r
 \r
 macro(add_idl_interface IDL_FILE)\r
     custom_incdefs()\r
     get_filename_component(FILE ${IDL_FILE} NAME_WE)\r
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c\r
-                       COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}\r
-                       DEPENDS ${IDL_FILE})\r
+    add_custom_command(\r
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c\r
+        COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}\r
+        DEPENDS ${IDL_FILE})\r
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE)\r
 endmacro()\r
index fa58664..0281951 100644 (file)
@@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-ADD_INTERFACE_DEFINITIONS(atl_atliface_header atliface.idl)
+add_interface_definitions(atl_atliface_header atliface.idl)
 
 set_rc_compiler()
 spec2def(atl.dll atl.spec)
index 9cea717..ffa2248 100644 (file)
@@ -1,5 +1,5 @@
 
-ADD_TYPELIB(jsglobal jsglobal.idl)
+add_typelib(jsglobal jsglobal.idl)
 add_dependencies(jsglobal stdole2)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
index e531921..5958aa8 100644 (file)
@@ -1,5 +1,5 @@
 
-ADD_TYPELIB(mshtml_tlb mshtml_tlb.idl)
+add_typelib(mshtml_tlb mshtml_tlb.idl)
 add_dependencies(mshtml_tlb stdole2)
 
 add_definitions(-D__WINESRC__)
index a590331..8714e3b 100644 (file)
@@ -9,7 +9,7 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl)
+add_interface_definitions(mshtml_nsiface_header nsiface.idl)
 
 set_rc_compiler()
 
index 49e6838..e5bec37 100644 (file)
@@ -1,4 +1,5 @@
-ADD_TYPELIB(msxml3_v1 msxml3_v1.idl)
+
+add_typelib(msxml3_v1 msxml3_v1.idl)
 add_dependencies(msxml3_v1 stdole2)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
index 10081d8..86741d7 100644 (file)
@@ -54,7 +54,8 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-ADD_INTERFACE_DEFINITIONS(ole32idl dcom.idl irot.idl)
+add_interface_definitions(ole32idl dcom.idl irot.idl)
+
 rpcproxy(ole32
     dcom.idl
     ole32_unknwn.idl
index f754c9f..053baa5 100644 (file)
@@ -1,5 +1,5 @@
 
-ADD_TYPELIB(pstorec_tlb pstorec_tlb.idl)
+add_typelib(pstorec_tlb pstorec_tlb.idl)
 add_dependencies(pstorec_tlb stdole2)
 
 add_definitions(-D__WINESRC__)
@@ -15,12 +15,7 @@ list(APPEND SOURCE
 add_library(pstorec SHARED ${SOURCE})
 
 set_module_type(pstorec win32dll)
-
-target_link_libraries(pstorec
-    uuid
-    wine)
-
+target_link_libraries(pstorec uuid wine)
 add_importlibs(pstorec msvcrt kernel32 ntdll)
-
 add_dependencies(pstorec pstorec_tlb pstorec_def)
 add_cab_target(pstorec 1)
index 0cee1c4..b472d03 100644 (file)
@@ -1,9 +1,8 @@
 
-ADD_TYPELIB(shdocvw_v1 shdocvw_v1.idl)
+add_typelib(shdocvw_v1 shdocvw_v1.idl)
 add_dependencies(shdocvw_v1 stdole2)
 
 add_definitions(-D_SHDOCVW_)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(shdocvw.dll shdocvw.spec)
index 569ddda..8487cce 100644 (file)
@@ -1,9 +1,8 @@
 
 add_definitions(-D__WINESRC__)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-ADD_TYPELIB(std_ole_v2 std_ole_v2.idl)
+add_typelib(std_ole_v2 std_ole_v2.idl)
 
 spec2def(stdole2.tlb stdole2.tlb.spec)
 
@@ -12,8 +11,5 @@ add_library(stdole2.tlb SHARED rsrc.rc
 
 set_entrypoint(stdole2.tlb 0)
 set_target_properties(stdole2.tlb PROPERTIES SUFFIX "")
-
-
-
 add_dependencies(stdole2.tlb std_ole_v2)
 add_cab_target(stdole2.tlb 1)
index b8c2fe5..01a2b59 100644 (file)
@@ -1,13 +1,13 @@
 
 add_definitions(-D__WINESRC__)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-ADD_TYPELIB(std_ole_v1 std_ole_v1.idl)
+add_typelib(std_ole_v1 std_ole_v1.idl)
 
 spec2def(stdole32.tlb stdole32.tlb.spec)
 
-add_library(stdole32.tlb SHARED rsrc.rc
+add_library(stdole32.tlb SHARED
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def)
 
 set_entrypoint(stdole32.tlb 0)
index ab262bf..0d19a12 100644 (file)
@@ -1,5 +1,5 @@
 
-LIST(APPEND SOURCE
+list(APPEND SOURCE
     amstream.idl
     amvideo.idl
     austream.idl
@@ -24,4 +24,4 @@ LIST(APPEND SOURCE
     #vmrender.idl
 )
 
-ADD_INTERFACE_DEFINITIONS(dxsdk ${SOURCE})
+add_interface_definitions(dxsdk ${SOURCE})
index ad85837..ce80326 100644 (file)
@@ -1,5 +1,5 @@
 
-LIST(APPEND SOURCE
+list(APPEND SOURCE
 #   access.idl
     activaut.idl
     activdbg.idl
@@ -103,10 +103,9 @@ LIST(APPEND SOURCE
 if(NOT MSVC)
   LIST(APPEND SOURCE
     wincodec.idl
-    wuapi.idl
-)
+    wuapi.idl)
 endif()
 
-ADD_INTERFACE_DEFINITIONS(psdk ${SOURCE})
+add_interface_definitions(psdk ${SOURCE})
 
-ADD_TYPELIB(stdole2 stdole2.idl)
+add_typelib(stdole2 stdole2.idl)
index b5857b9..c6f98c3 100644 (file)
@@ -7,7 +7,9 @@ list(APPEND SOURCE
     svcctl.idl
     wlansvc.idl)
 
-MACRO_IDL_FILES(${SOURCE})
+idl_files(${SOURCE})
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
-MACRO_IDL_FILES(pnp.idl)
+
+idl_files(pnp.idl)
index dccf6b3..4a50104 100644 (file)
@@ -1,9 +1,9 @@
 
-ADD_INTERFACE_DEFINITIONS(wineheaders itss.idl wined3d.idl)
+add_interface_definitions(wineheaders itss.idl wined3d.idl)
 
 list(APPEND SOURCE
     epm.idl
     irot.idl)
 
-MACRO_IDL_FILES(${SOURCE})
-ADD_INTERFACE_DEFINITIONS(winesdk ${SOURCE})
\ No newline at end of file
+idl_files(${SOURCE})
+add_interface_definitions(winesdk ${SOURCE})