diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-03-31 23:46:08 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-03-31 23:46:08 +0300 |
| commit | c2711f2d763cfbf96d8db48b0809dd7a6e65a73e (patch) | |
| tree | 44d58dc436ad0721e4c8ea97d0b639d31e5fb88c /indra/cmake | |
| parent | a106d6cf78833a3e24f8d478807f6363e4af5652 (diff) | |
Revert "SL-13182 Turn on openmp paralellization on Windows"
This reverts commit a106d6cf78833a3e24f8d478807f6363e4af5652.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 289d65e975..8aea50e02b 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -72,10 +72,10 @@ if (WINDOWS) endif() set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /openmp /Zo" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Zo" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /openmp /Zo" + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /Zo" CACHE STRING "C++ compiler release options" FORCE) # zlib has assembly-language object files incompatible with SAFESEH set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE /SAFESEH:NO /NODEFAULTLIB:LIBCMT /IGNORE:4099") |