[CMAKE]

[reactos.git] / CMakeMacros.cmake

diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake
index 880555a..d0a858b 100644 (file)
--- a/CMakeMacros.cmake
+++ b/CMakeMacros.cmake
@@ -125,23 +125,19 @@ MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd
        set(_nameoncd ${ARGN})\r
     endif()\r
 \r
-    add_custom_command(\r
-        OUTPUT ${BOOTCD_DIR}/${_dir}/${_nameoncd}        \r
-        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
-\r
-    add_custom_target(${_targetname}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
+    add_custom_target(${_targetname}_minicd \r
+        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}\r
+        DEPENDS ${_targetname})\r
+    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
 \r
-    add_dependencies(${_targetname}_minicd ${_targetname})\r
     add_dependencies(minicd ${_targetname}_minicd)\r
-ENDMACRO(add_minicd_target _targetname _dir _nameoncd)\r
+ENDMACRO(add_minicd_target)\r
 \r
 MACRO(add_minicd FILENAME _dir _nameoncd)\r
-    add_custom_command(\r
-        OUTPUT ${BOOTCD_DIR}/${_dir}/${_nameoncd}\r
-        DEPENDS ${FILENAME}\r
-        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
-        \r
-    add_custom_target(${_nameoncd}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
+    add_custom_target(${_nameoncd}_minicd\r
+        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}\r
+        DEPENDS ${FILENAME})\r
+    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
     \r
     add_dependencies(minicd ${_nameoncd}_minicd)\r
 ENDMACRO(add_minicd)\r
@@ -161,24 +157,20 @@ MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd
        set(_nameoncd ${ARGN})\r
     endif()\r
 \r
-    add_custom_command(\r
-        OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd}        \r
-        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd})\r
-        \r
-    add_custom_target(${_targetname}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd})\r
+    add_custom_target(${_targetname}_livecd \r
+        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}\r
+        DEPENDS ${_targetname})\r
+    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd})\r
 \r
-    add_dependencies(${_targetname}_livecd ${_targetname})\r
     add_dependencies(livecd ${_targetname}_livecd)\r
-ENDMACRO(add_livecd_target _targetname _dir _nameoncd)\r
+ENDMACRO(add_livecd_target)\r
 \r
 MACRO(add_livecd FILENAME _dir _nameoncd)\r
-    add_custom_command(\r
-        OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd}\r
-        DEPENDS ${FILENAME}\r
-        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd})\r
-        \r
-    add_custom_target(${_nameoncd}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd})\r
-    \r
+    add_custom_target(${_nameoncd}_livecd\r
+        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}\r
+        DEPENDS ${FILENAME})\r
+    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd})\r
+\r
     add_dependencies(livecd ${_nameoncd}_livecd)\r
 ENDMACRO(add_livecd)\r
 \r
@@ -236,8 +228,8 @@ macro (MACRO_IDL_FILES)
         get_filename_component(FILE ${_in_FILE} NAME_WE)\r
         add_custom_command(\r
             OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c\r
-            COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h -s -S ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl\r
-            DEPENDS native-widl)\r
+            COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl
+            DEPENDS ${_in_file})
         set_source_files_properties(\r
             ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c\r
             PROPERTIES GENERATED TRUE)\r
@@ -246,8 +238,8 @@ macro (MACRO_IDL_FILES)
     \r
         add_custom_command(\r
             OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c\r
-            COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h -c -C ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl\r
-            DEPENDS native-widl)\r
+            COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl
+            DEPENDS ${_in_file})
         set_source_files_properties(\r
             ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c\r
             PROPERTIES GENERATED TRUE)\r
@@ -256,3 +248,16 @@ macro (MACRO_IDL_FILES)
     endforeach(_in_FILE ${ARGN})\r
 \r
 endmacro (MACRO_IDL_FILES)\r
+
+macro(ADD_TYPELIB TARGET)
+  custom_incdefs()
+  foreach(SOURCE ${ARGN})
+    get_filename_component(FILE ${SOURCE} NAME_WE)
+    set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb
+                       COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}
+                       DEPENDS ${SOURCE})
+    list(APPEND OBJECTS ${OBJECT})
+  endforeach()
+  add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})
+endmacro()