Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builtins/gtest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ set(_gtest_byproducts

set(GTEST_CXX_FLAGS "${ROOT_EXTERNAL_CXX_FLAGS}")
if(MSVC)
if(winrtdebug)
if(winrtdebug)
set(GTEST_BUILD_TYPE Debug)
else()
set(GTEST_BUILD_TYPE Release)
Expand Down
2 changes: 1 addition & 1 deletion interpreter/CppInterOp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ endif ()

# Fixes "C++ exception handler used, but unwind semantics are not enabled" warning Windows
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /bigobj")
# Required for clang::driver::options::OPT_ see https://github.com/llvm/llvm-project/issues/86028
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Zc:preprocessor")
endif ()
Expand Down
3 changes: 3 additions & 0 deletions roottest/root/io/cpp11Containers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ ROOTTEST_GENERATE_EXECUTABLE(
LIBRARIES Core RIO Tree TreePlayer Hist GTest::gtest GTest::gtest_main GTest::gmock GTest::gmock_main ROOT::TestSupport
FIXTURES_REQUIRED root-io-cpp11Containers-unorderedMapDict-fixture
FIXTURES_SETUP root-io-cpp11Containers-unorderedMapUnitTests-fixture)
if(MSVC)
set_source_files_properties(unorderedMapUnitTests.cxx COMPILE_FLAGS /bigobj)
endif()

ROOTTEST_ADD_TEST(unorderedMapUnitTests
EXEC ${CMAKE_CURRENT_BINARY_DIR}/unorderedMapUnitTests
Expand Down
Loading