diff options
| author | Runitai Linden <davep@lindenlab.com> | 2021-12-17 09:27:19 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2021-12-17 09:27:19 -0600 |
| commit | 92933b42522b37ad78fd714e8416681183d7d7f9 (patch) | |
| tree | 3a859deda6047d28df3e2bd04c4299ca21c81495 /indra/cmake/00-Common.cmake | |
| parent | dd032467357a4aaf69c752c13e53122aff6c4755 (diff) | |
| parent | 3ac21ebbf6b354e16ead2d095a61152c95a7243c (diff) | |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra/cmake/00-Common.cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index bf54b655c2..bb5dd8f847 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -70,7 +70,6 @@ if (WINDOWS) if( ADDRESS_SIZE EQUAL 32 ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64") endif() - # Preserve first-pass-through versions (ie no FORCE overwrite). Prevents recursive addition of /Zo (04/2021) set(OG_CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} CACHE STRING "OG_CXX_FLAGS_RELEASE") set(OG_CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} CACHE STRING "OG_CXX_FLAGS_RELWITHDEBINFO") |