Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 05:55:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE] Build host-tools as release by default

Browse source 
This setting can be overwritten by defining the CMake variable HOST_BUILD_TYPE.
The target build type is passed to the host build as TARGET_BUILD_TYPE CMake variable.
This improves time to build cab+iso:
MSVC x86: 37s -> 28s
GCC x86: 32s -> 16s
This commit is contained in:
Timo Kreuzer 2024-12-01 14:29:04 +02:00
parent 7a15da2a8c
commit 8a63d7e898
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sdk/cmake/host-tools.cmake
View file

@ -91,6 +91,10 @@ function(setup_host_tools)
) )
endif() endif()
if(NOT DEFINED HOST_BUILD_TYPE)
set(HOST_BUILD_TYPE Release)
endif()
ExternalProject_Add(host-tools ExternalProject_Add(host-tools
SOURCE_DIR ${REACTOS_SOURCE_DIR} SOURCE_DIR ${REACTOS_SOURCE_DIR}
PREFIX ${REACTOS_BINARY_DIR}/host-tools PREFIX ${REACTOS_BINARY_DIR}/host-tools
@ -102,6 +106,8 @@ function(setup_host_tools)
-DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools
-DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin -DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin
-DTARGET_COMPILER_ID=${CMAKE_C_COMPILER_ID} -DTARGET_COMPILER_ID=${CMAKE_C_COMPILER_ID}
-DTARGET_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_BUILD_TYPE=${HOST_BUILD_TYPE}
${CMAKE_HOST_TOOLS_EXTRA_ARGS} ${CMAKE_HOST_TOOLS_EXTRA_ARGS}
BUILD_ALWAYS TRUE BUILD_ALWAYS TRUE
INSTALL_COMMAND ${CMAKE_COMMAND} -E true INSTALL_COMMAND ${CMAKE_COMMAND} -E true

4
sdk/tools/CMakeLists.txt
View file

@ -48,6 +48,10 @@ if ((ARCH STREQUAL "amd64") AND (TARGET_COMPILER_ID STREQUAL "GNU"))
add_subdirectory(gcc_plugin_seh) add_subdirectory(gcc_plugin_seh)
endif() endif()
if (TARGET_BUILD_TYPE)
# Silence warning about unused variable
endif()
if(NOT MSVC) if(NOT MSVC)
add_host_tool(pefixup pefixup.c) add_host_tool(pefixup pefixup.c)
if (ARCH STREQUAL "amd64" OR ARCH STREQUAL "arm64") if (ARCH STREQUAL "amd64" OR ARCH STREQUAL "arm64")