[CMAKE]

[reactos.git] / reactos / cmake / CMakeMacros.cmake

diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index f6f4bcb..716ac07 100644 (file)
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -191,6 +191,74 @@ macro(dir_to_num dir var)
         set(${var} 17)
     elseif(${dir} STREQUAL reactos/Resources/Themes/Lautus)
         set(${var} 18)
+    elseif(${dir} STREQUAL reactos/Help)
+        set(${var} 19)
+    elseif(${dir} STREQUAL reactos/Config)
+        set(${var} 20)
+    elseif(${dir} STREQUAL reactos/Cursors)
+        set(${var} 21)
+    elseif(${dir} STREQUAL reactos/system32/ShellExt)
+        set(${var} 22)
+    elseif(${dir} STREQUAL reactos/Temp)
+        set(${var} 23)
+    elseif(${dir} STREQUAL reactos/system32/spool)
+        set(${var} 24)
+    elseif(${dir} STREQUAL reactos/system32/spool/drivers)
+        set(${var} 25)
+    elseif(${dir} STREQUAL reactos/system32/spool/drivers/color)
+        set(${var} 26)
+    elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86)
+        set(${var} 27)
+    elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86/3)
+        set(${var} 28)
+    elseif(${dir} STREQUAL reactos/system32/spool/prtprocs)
+        set(${var} 29)
+    elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/w32x86)
+        set(${var} 30)
+    elseif(${dir} STREQUAL reactos/system32/spool/PRINTERS)
+        set(${var} 31)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Repository)
+        set(${var} 32)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS)
+        set(${var} 33)
+    elseif(${dir} STREQUAL reactos/system32/wbem/mof/good)
+        set(${var} 34)
+    elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad)
+        set(${var} 35)
+    elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus)
+        set(${var} 36)
+    elseif(${dir} STREQUAL reactos/system32/wbem/xml)
+        set(${var} 37)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Logs)
+        set(${var} 38)
+    elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover)
+        set(${var} 39)
+    elseif(${dir} STREQUAL reactos/system32/wbem/snmp)
+        set(${var} 40)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Performance)
+        set(${var} 41)
+    elseif(${dir} STREQUAL reactos/twain_32)
+        set(${var} 42)
+    elseif(${dir} STREQUAL reactos/repair)
+        set(${var} 43)
+    elseif(${dir} STREQUAL reactos/Web)
+        set(${var} 44)
+    elseif(${dir} STREQUAL reactos/Web/Wallpaper)
+        set(${var} 45)
+    elseif(${dir} STREQUAL reactos/Prefetch)
+        set(${var} 46)
+    elseif(${dir} STREQUAL reactos/security)
+        set(${var} 47)
+    elseif(${dir} STREQUAL reactos/security/Database)
+        set(${var} 48)
+    elseif(${dir} STREQUAL reactos/security/logs)
+        set(${var} 49)
+    elseif(${dir} STREQUAL reactos/security/templates)
+        set(${var} 50)
+    elseif(${dir} STREQUAL reactos/system32/CatRoot)
+        set(${var} 51)
+    elseif(${dir} STREQUAL reactos/system32/CatRoot2)
+        set(${var} 52)
     else()
         message(FATAL_ERROR "Wrong destination: ${dir}")
     endif()
@@ -239,7 +307,7 @@ function(add_cd_file)
             endforeach()
             if(_CD_TARGET)
                 #manage dependency
-                add_dependencies(bootcd ${_CD_TARGET})
+                add_dependencies(bootcd ${_CD_TARGET} converted_hives)
             endif()
         else()
             #add it in reactos.cab
@@ -250,6 +318,12 @@ function(add_cd_file)
             if(_CD_TARGET)
                 #manage dependency
                 add_dependencies(reactos_cab ${_CD_TARGET})
+                # add this so that the combination make target/fast reactos_cab/fast bootcd/fast properly detects that reactos.cab must be rebuilt
+                if (CMAKE_BUILD_TOOL STREQUAL "make")
+                    add_custom_command(TARGET ${_CD_TARGET}
+                                       POST_BUILD
+                                       COMMAND ${CMAKE_COMMAND} -E touch ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff)
+                endif()
             endif()
         endif()
     endif() #end bootcd
@@ -259,7 +333,7 @@ function(add_cd_file)
     if(NOT __cd EQUAL -1)
         #manage dependency
         if(_CD_TARGET)
-            add_dependencies(livecd ${_CD_TARGET})
+            add_dependencies(livecd ${_CD_TARGET} converted_hives)
         endif()
         foreach(item ${_CD_FILE})
             if(_CD_NAME_ON_CD)
@@ -289,7 +363,7 @@ function(add_cd_file)
             endforeach()
             if(_CD_TARGET)
                 #manage dependency
-                add_dependencies(bootcdregtest ${_CD_TARGET})
+                add_dependencies(bootcdregtest ${_CD_TARGET} converted_hives)
             endif()
         else()
             #add it in reactos.cab
@@ -417,7 +491,7 @@ function(add_importlibs _module)
 endfunction()
 
 function(set_module_type MODULE TYPE)
-    cmake_parse_arguments(__module "UNICODE" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
+    cmake_parse_arguments(__module "UNICODE;HOTPATCHABLE" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
 
     if(__module_UNPARSED_ARGUMENTS)
         message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}")
@@ -457,6 +531,17 @@ function(set_module_type MODULE TYPE)
         add_target_compile_definitions(${MODULE} UNICODE _UNICODE)
     endif()
 
+    # Handle hotpatchable images.
+    # GCC has this as a function attribute so we're handling it using DECLSPEC_HOTPATCH
+    if(__module_HOTPATCHABLE AND MSVC AND (NOT ARCH STREQUAL "arm"))
+        set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS " /hotpatch")
+        if(ARCH STREQUAL "i386")
+            set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:5")
+        elseif(ARCH STREQUAL "amd64")
+            set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:6")
+        endif()
+    endif()
+
     # set entry point
     if(__module_ENTRYPOINT OR (__module_ENTRYPOINT STREQUAL "0"))
         list(GET __module_ENTRYPOINT 0 __entrypoint)