set(${var} 16)
elseif(${dir} STREQUAL reactos/system32/wbem)
set(${var} 17)
- else()
+ 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()
endmacro()
endif()
if(NOT _CD_FOR)
- message(FATAL_ERROR "You must provide a cd name (or "all" for all of them) to install the file on!")
+ message(FATAL_ERROR "You must provide a cd name (or \"all\" for all of them) to install the file on!")
endif()
#get file if we need to
if(_CD_NO_CAB)
#directly on cd
foreach(item ${_CD_FILE})
- file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n")
+ if(_CD_NAME_ON_CD)
+ #rename it in the cd tree
+ set(__file ${_CD_NAME_ON_CD})
+ else()
+ get_filename_component(__file ${item} NAME)
+ endif()
+ set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}")
endforeach()
- if(_CD_NAME_ON_CD)
- get_filename_component(__file ${_CD_FILE} NAME)
- #rename it in the cd tree
- file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n")
- endif()
if(_CD_TARGET)
#manage dependency
- add_dependencies(bootcd ${_CD_TARGET})
+ add_dependencies(bootcd ${_CD_TARGET} converted_hives)
endif()
else()
#add it in reactos.cab
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
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})
- file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n")
+ if(_CD_NAME_ON_CD)
+ #rename it in the cd tree
+ set(__file ${_CD_NAME_ON_CD})
+ else()
+ get_filename_component(__file ${item} NAME)
+ endif()
+ set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}")
endforeach()
- if(_CD_NAME_ON_CD)
- get_filename_component(__file ${_CD_FILE} NAME)
- #rename it in the cd tree
- file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n")
- endif()
endif() #end livecd
#do we add it to regtest?
if(_CD_NO_CAB)
#directly on cd
foreach(item ${_CD_FILE})
- file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n")
+ if(_CD_NAME_ON_CD)
+ #rename it in the cd tree
+ set(__file ${_CD_NAME_ON_CD})
+ else()
+ get_filename_component(__file ${item} NAME)
+ endif()
+ set_property(GLOBAL APPEND PROPERTY BOOTCDREGTEST_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}")
endforeach()
- if(_CD_NAME_ON_CD)
- get_filename_component(__file ${_CD_FILE} NAME)
- #rename it in the cd tree
- file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n")
- endif()
if(_CD_TARGET)
#manage dependency
- add_dependencies(bootcdregtest ${_CD_TARGET})
+ add_dependencies(bootcdregtest ${_CD_TARGET} converted_hives)
endif()
else()
#add it in reactos.cab
endif() #end bootcd
endfunction()
+function(create_iso_lists)
+ get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST)
+ string(REPLACE ";" "\n" _filelist "${_filelist}")
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.lst "${_filelist}")
+ unset(_filelist)
+
+ get_property(_filelist GLOBAL PROPERTY LIVECD_FILE_LIST)
+ string(REPLACE ";" "\n" _filelist "${_filelist}")
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.lst "${_filelist}")
+ unset(_filelist)
+
+ get_property(_filelist GLOBAL PROPERTY BOOTCDREGTEST_FILE_LIST)
+ string(REPLACE ";" "\n" _filelist "${_filelist}")
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.lst "${_filelist}")
+ unset(_filelist)
+endfunction()
+
# Create module_clean targets
function(add_clean_target _target)
set(_clean_working_directory ${CMAKE_CURRENT_BINARY_DIR})
_add_executable(${name} ${ARGN})
add_clean_target(${name})
endfunction()
+elseif(USE_FOLDER_STRUCTURE)
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ string(LENGTH ${CMAKE_SOURCE_DIR} CMAKE_SOURCE_DIR_LENGTH)
+
+ function(add_custom_target name)
+ _add_custom_target(${name} ${ARGN})
+ string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE)
+ set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}")
+ endfunction()
+
+ function(add_library name)
+ _add_library(${name} ${ARGN})
+ get_target_property(_target_excluded ${name} EXCLUDE_FROM_ALL)
+ if(_target_excluded AND ${name} MATCHES "^lib.*")
+ set_property(TARGET "${name}" PROPERTY FOLDER "Importlibs")
+ else()
+ string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE)
+ set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}")
+ endif()
+ endfunction()
+
+ function(add_executable name)
+ _add_executable(${name} ${ARGN})
+ string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE)
+ set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}")
+ endfunction()
endif()
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
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}")
set(__subsystem console)
elseif(${TYPE} STREQUAL win32gui)
set(__subsystem windows)
+ elseif(${TYPE} STREQUAL kbdlayout)
+ set_entrypoint(${MODULE} 0)
+ set_image_base(${MODULE} 0x5FFF0000)
+ set_subsystem(${MODULE} native)
+ if (MSVC)
+ # Merge the .text and .rdata section into the .data section
+ add_target_link_flags(${MODULE} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data")
+ else()
+ # Use a custom linker script
+ add_target_link_flags(${MODULE} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds")
+ add_dependencies(${MODULE} "${CMAKE_SOURCE_DIR}/kbdlayout.lds")
+ endif()
elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx)
OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module)))
message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}")
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)
elseif(${TYPE} STREQUAL nativecui)
set(__entrypoint NtProcessStartup)
set(__entrystack 4)
- elseif((${TYPE} STREQUAL win32gui) OR (${TYPE} STREQUAL win32cui))
+ elseif(${TYPE} STREQUAL win32cui)
+ if(__module_UNICODE)
+ set(__entrypoint wmainCRTStartup)
+ else()
+ set(__entrypoint mainCRTStartup)
+ endif()
+ elseif(${TYPE} STREQUAL win32gui)
if(__module_UNICODE)
set(__entrypoint wWinMainCRTStartup)
else()
set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE)
endfunction()
-if(NOT MSVC AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
+if(NOT MSVC)
function(add_object_library _target)
add_library(${_target} OBJECT ${ARGN})
endfunction()
add_library(${_target} ${ARGN})
endfunction()
endif()
+
+if(KDBG)
+ set(ROSSYM_LIB "rossym")
+else()
+ set(ROSSYM_LIB "")
+endif()
projects / reactos.git / blobdiff