https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2317d773e937e0504aa4ceb11caee7b409c7f0f
commit c2317d773e937e0504aa4ceb11caee7b409c7f0f Author: Serge Gautherie <[email protected]> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <[email protected]> CommitDate: Fri Jun 11 02:08:12 2021 +0300 [CMAKE] host-tools: Define ROS_SAVED_* for MSVC_IDE only Addendum to 18e95f5. ROSBE-174 --- sdk/cmake/host-tools.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index 8533c3614ee..a415297455c 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -79,6 +79,14 @@ function(setup_host_tools) -DCMAKE_CXX_COMPILER=cl) endif() + if (MSVC_IDE) + # Required for Bison/Flex wrappers created by /CMakeLists.txt. + list(APPEND CMAKE_HOST_TOOLS_EXTRA_ARGS + -DROS_SAVED_BISON_PKGDATADIR=${ROS_SAVED_BISON_PKGDATADIR} + -DROS_SAVED_M4=${ROS_SAVED_M4} + ) + endif() + ExternalProject_Add(host-tools SOURCE_DIR ${REACTOS_SOURCE_DIR} PREFIX ${REACTOS_BINARY_DIR}/host-tools @@ -89,8 +97,6 @@ function(setup_host_tools) -DARCH:STRING=${ARCH} -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools -DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin - -DROS_SAVED_M4=${ROS_SAVED_M4} - -DROS_SAVED_BISON_PKGDATADIR=${ROS_SAVED_BISON_PKGDATADIR} -DTARGET_COMPILER_ID=${CMAKE_C_COMPILER_ID} ${CMAKE_HOST_TOOLS_EXTRA_ARGS} BUILD_ALWAYS TRUE
