[CMAKE]
[reactos.git] / CMakeMacros.cmake
index 0499a92..d0a858b 100644 (file)
@@ -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
@@ -150,112 +146,108 @@ macro(set_cpp)
   include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport)
   set(IS_CPP 1)
 endmacro()
-
-MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd
-    
-    get_target_property(FILENAME ${_targetname} LOCATION)
-
-    if("${ARGN}" STREQUAL "")
-       get_filename_component(_nameoncd ${FILENAME} NAME)
-    else()
-       set(_nameoncd ${ARGN})
-    endif()
-
-    add_custom_command(
-        OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd}        
-        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd})
-        
-    add_custom_target(${_targetname}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd})
-
-    add_dependencies(${_targetname}_livecd ${_targetname})
-    add_dependencies(livecd ${_targetname}_livecd)
-ENDMACRO(add_livecd_target _targetname _dir _nameoncd)
-
-MACRO(add_livecd FILENAME _dir _nameoncd)
-    add_custom_command(
-        OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd}
-        DEPENDS ${FILENAME}
-        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd})
-        
-    add_custom_target(${_nameoncd}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd})
-    
-    add_dependencies(livecd ${_nameoncd}_livecd)
-ENDMACRO(add_livecd)
-
-macro(custom_incdefs)
-    if(NOT DEFINED result_incs) #rpc_defines
-        get_directory_property(rpc_defines COMPILE_DEFINITIONS)
-        get_directory_property(rpc_includes INCLUDE_DIRECTORIES)
-
-        foreach(arg ${rpc_defines})
-            set(result_defs ${result_defs} -D${arg})
-        endforeach(arg ${defines})
-
-        foreach(arg ${rpc_includes})
-            set(result_incs -I${arg} ${result_incs})
-        endforeach(arg ${includes})
-    endif()
-endmacro(custom_incdefs)
-
-macro(rpcproxy TARGET)
-    custom_incdefs()
-        list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c)
-
-    foreach(_in_FILE ${ARGN})
-        get_filename_component(FILE ${_in_FILE} NAME_WE)
-        add_custom_command(
-            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c
-            COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl
-            DEPENDS native-widl)
-        set_source_files_properties(
-            ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c
-            PROPERTIES GENERATED TRUE)
-        list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)
-        list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl)
-        list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p)
-        add_custom_target(${TARGET}_${FILE}_p 
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)
-        #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p)
-    endforeach(_in_FILE ${ARGN})
-    
-       add_custom_command(
-           OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
-           COMMAND native-widl ${result_incs} ${result_defs}  -m32 --win32 --dlldata-only --dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS}
-           DEPENDS native-widl)
-       set_source_files_properties(
-           ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
-           PROPERTIES GENERATED TRUE)
-        
-        add_library(${TARGET}_proxy ${SOURCE})
-        add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS})
-endmacro(rpcproxy)
-
-macro (MACRO_IDL_FILES)
-    custom_incdefs()
-    foreach(_in_FILE ${ARGN})
-        get_filename_component(FILE ${_in_FILE} NAME_WE)
-        add_custom_command(
-            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c
+\r
+MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd\r
+    \r
+    get_target_property(FILENAME ${_targetname} LOCATION)\r
+\r
+    if("${ARGN}" STREQUAL "")\r
+       get_filename_component(_nameoncd ${FILENAME} NAME)\r
+    else()\r
+       set(_nameoncd ${ARGN})\r
+    endif()\r
+\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(livecd ${_targetname}_livecd)\r
+ENDMACRO(add_livecd_target)\r
+\r
+MACRO(add_livecd FILENAME _dir _nameoncd)\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
+macro(custom_incdefs)\r
+    if(NOT DEFINED result_incs) #rpc_defines\r
+        get_directory_property(rpc_defines COMPILE_DEFINITIONS)\r
+        get_directory_property(rpc_includes INCLUDE_DIRECTORIES)\r
+\r
+        foreach(arg ${rpc_defines})\r
+            set(result_defs ${result_defs} -D${arg})\r
+        endforeach(arg ${defines})\r
+\r
+        foreach(arg ${rpc_includes})\r
+            set(result_incs -I${arg} ${result_incs})\r
+        endforeach(arg ${includes})\r
+    endif()\r
+endmacro(custom_incdefs)\r
+\r
+macro(rpcproxy TARGET)\r
+    custom_incdefs()\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
+        add_custom_command(\r
+            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c\r
+            COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl\r
+            DEPENDS native-widl)\r
+        set_source_files_properties(\r
+            ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c\r
+            PROPERTIES GENERATED TRUE)\r
+        list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)\r
+        list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl)\r
+        list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p)\r
+        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
+    \r
+       add_custom_command(\r
+           OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c\r
+           COMMAND native-widl ${result_incs} ${result_defs}  -m32 --win32 --dlldata-only --dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS}\r
+           DEPENDS native-widl)\r
+       set_source_files_properties(\r
+           ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c\r
+           PROPERTIES GENERATED TRUE)\r
+        \r
+        add_library(${TARGET}_proxy ${SOURCE})\r
+        add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS})\r
+endmacro(rpcproxy)\r
+\r
+macro (MACRO_IDL_FILES)\r
+    custom_incdefs()\r
+    foreach(_in_FILE ${ARGN})\r
+        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 ${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(
-            ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c
-            PROPERTIES GENERATED TRUE)
-        add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c)
-        add_dependencies(${FILE}_server psdk)
-    
-        add_custom_command(
-            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c
+        set_source_files_properties(\r
+            ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c\r
+            PROPERTIES GENERATED TRUE)\r
+        add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c)\r
+        add_dependencies(${FILE}_server psdk)\r
+    \r
+        add_custom_command(\r
+            OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c\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(
-            ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c
-            PROPERTIES GENERATED TRUE)
-        add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c)
-        add_dependencies(${FILE}_client psdk)
-    endforeach(_in_FILE ${ARGN})
-
-endmacro (MACRO_IDL_FILES)
+        set_source_files_properties(\r
+            ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c\r
+            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
 
 macro(ADD_TYPELIB TARGET)
   custom_incdefs()