diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 9f9899553..14a4caed1 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -393,8 +393,9 @@ macro(configureCMake) if (LD_LLD_PATH) set(CMAKE_LINKER ${LD_LLD_PATH}) - if (NOT XCODE) - add_compile_options(-fuse-ld=lld) + if (NOT XCODE AND NOT MSVC) + set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -fuse-ld=lld) + set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fuse-ld=lld) endif() else () message(WARNING "lld not found, using default linker!") @@ -627,8 +628,8 @@ macro(setupCompilerFlags target) endif() if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") - if (IMHEX_ENABLE_UNITY_BUILD AND WIN32) - addCommonFlag("-Wa,mbig-obj" ${target}) + if (WIN32) + target_link_options(${target} PUBLIC "-Wa,mbig-obj") endif () endif()