summaryrefslogtreecommitdiff
path: root/indra/cmake/00-Common.cmake
AgeCommit message (Collapse)Author
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-11-16DRTVWR-546 exterminate tab char from 00-Common.cmake (fails Mac build)Dave Houlton
2021-11-12(Moved from DRTVWR-528) clean up cmake recursive CXX_FLAGS definition (/Zo)Dave Houlton
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-28Merge with tip of ReleaseCallum Prentice
2020-09-11Effective rename of DRTVWR-506-simple since there is no way to rename a ↵Callum Prentice
branch. Cloned canonical viewer into DRTVWR-519, copied over the files that changed from DRTVWR-506-simple and pushed back. Once I am satisfied everything is correct, DRTVWR-506-simple will be removed
2020-08-24DRTVWR-497 restore parallel builds for x64 VS2017Dave Houlton
2020-08-21Small change to CMake options to only enable the ↵Callum Prentice
PreferredToolArchitecture=x64 option (required for 32bit TeamCity builds) on 32 bit builds generally - removes a ton of 'unknown option, ignored' spam in the build output
2020-06-26DRTVWR-476: On Windows, request 64-bit compilerNat Goodspeed
to avoid TeamCity build failures due to 32-bit compiler running out of virtual memory for precompiled headers.
2019-03-06Get rid of vstoolandreykproductengine
2019-03-04Fix for local studio buildsandreykproductengine
2019-01-16Re-enable warnings-as-errors (-Werror) in Mac builds.Nat Goodspeed
2017-09-19DRTVWR-418: Another attempt to generate Mac debug symbols.Nat Goodspeed
The viewer's 00-COMPILE-LINK-RUN.txt recommends passing -gdwarf-2 to the Mac compiler, and so we've been doing ever since before the viewer-build-variables repo was engaged. Now we discover that when CMake sees -gdwarf-2, it removes the -g switch entirely. It also removes it when you pass plain -g. Only when you pass -gdwarf-with-dsym or just -gdwarf does CMake pass plain -g to the compiler. Change -gdwarf-2, if specified, to -gdwarf so we at least get -g.
2017-05-09DRTVWR-418: Set -std=c++14 for Mac even before viewer-build-variables.Nat Goodspeed
2017-05-04Expand the way we set C++ flags in cmake to call out each build type explicitlyCallum Prentice
2016-12-19DRTVWR-418: Use $LL_BUILD to set most switches in 00-Common.cmake.Nat Goodspeed
Going forward, the intention is to set in 00-Common.cmake only switches not already set for ALL viewer-related libraries in https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables. To that end, remove all switches redundant with settings from that file. Remove redundancies within 00-Common.cmake. Remove cruft testing for gcc versions older than 4.3.
2016-12-15DRTVWR-418: -Wl,-no_compact_unwind switch breaks exception catching!Nat Goodspeed
In a clang 64-bit compile, with that switch set in CMAKE_CXX_LINK_FLAGS, we cannot catch any user exception. This shows up right away because TUT relies on internal exceptions to walk through test<n>() test methods, but of course being unable to catch any exceptions in the viewer would be just as bad. A quick Google search turned up lots of people mentioning -no_compact_unwind without finding any documentation about what it's supposed to be good for. But since no tests work with it, whereas they work without it -- kill it.
2016-12-05suppress VS linker warning about unfound pdb filesOz Linden
2016-11-16DRTVWR-418: Disable unconditional signing for Mac builds.Nat Goodspeed
There Must Be A Better Way.
2016-11-16DRTVWR-418: Pass ADDRESS_SIZE down into C++ compilationNat Goodspeed
by adding -DADDRESS_SIZE= to the compile switches. Remove hack to work around limitations of gcc 4.1 build hosts. Streamline a bit of logic to specify correct -m32 or -m64 switch. Use ADDRESS_SIZE instead of ARCH to control -march=pentiumpro.
2016-11-16DRTVWR-418: pull in new viewer-release via viewer64Nat Goodspeed
2016-11-15DRTVWR-418: Mistakenly inverted the sense of the LL_64BIT_BUILD test.Nat Goodspeed
2016-11-15DRTVWR-418: Fold windows64 into windows platform with new autobuild.Nat Goodspeed
autobuild 1.1 now supports expanding $variables within a config file -- support that was explicitly added to address this very problem. So now the windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE, $AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle most of the deltas between the windows platform and windows64. This permits removing the windows64 platform definition from autobuild.xml. The one remaining delta between the windows64 and windows platform definitions was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
2016-09-20Small improvements to UI DPI scaling on Windows:Ansariel
* Use USER_DEFAULT_SCREEN_DPI define from WinUser.h * Change Win32 SDK target version to Windows Vista or greater * Define WM_DPICHANGED as preprocessor definition as in WinUser.h * Cull manual definitions of WM_MOUSEWHEEL and WHEEL_DELTA which are part of the Win32 SDK since Windows NT 4.0
2016-04-24Windows z64: Disable warning 4267 via llpreprocessor rather than cmake filesNicky
(transplanted from 165fa5852652a1da005cf3b2201c192f028efd43)
2016-04-22Windows x64: Disable warning 4267 (it causes too much noise) and do not ↵Nicky
enable /arch:SSE2 (x64 implies SSE2 and setting the flag causes warnings). (transplanted from 5a7cc3874065b13a83b8c7aa044fb07f38edd283)
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-13MAINT-5862 Fix Provide a way for new Linux users to accept ToScallum_linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-09-18Turn off (for now) the warnings/errors that result from Boost.Units usagecallum_linden
2015-01-16Add flags to inject extra debugging information (via Sovreign Engineer)callum_linden
2014-12-18allow signed vs unsigned compare in gccOz Linden
2014-12-11Add /SAFESEH:NO /NODEFAULTLIB:LIBCMT to viewer linker switches.Nat Goodspeed
zlib cannot be linked with SAFESEH, which is the VS 2013 default, so every consumer must set /SAFESEH:NO. /NODEFAULTLIB:LIBCMT seems to eliminate many duplicate-symbol link errors.
2014-10-21Update to build on Xcode 6.0: remove final, unwanted warningcallum_linden
2014-10-20Update to build on Xcode 6.0: Remove concept of XCODE_VERSION from CMake ↵callum_linden
files - we standardize on Xcode 6
2014-10-20Update to build on Xcode 6.0: Large (and final) collection of fixes for ↵callum_linden
unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-10-17Update to build on Xcode 6.0: turn BACK ON warnings as errors for overloaded ↵callum_linden
virtuals [-Woverloaded-virtual] and fix up first (of many) files
2014-10-17Update to build on Xcode 6.0: turn OFF warnings as errors for overloaded ↵callum_linden
virtuals [-Wno-overloaded-virtual]
2014-10-17Update to build on Xcode 6.0: first pass at CMake changes to get a build startedcallum_linden
2014-07-08Merge. Refresh from viewer-release after 3.7.11 release.Monty Brandenberg
2014-05-28Win: Get running on Windows. Remove DOM_DYNAMIC, link with libxml2_a.lib.Monty Brandenberg
Release and Debug builds working. Remove the DOM_DYNAMIC define so that we don't create declspec declarations to colladadom objects and pull in libxml2_a (_a for archive) to complete the link. Debug functional and would be moreso if not for all the CrtCheckMemory() calls.
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-04-22catch a few more cases of STANDALONE -> USESYSTEMLIBSOz Linden
2014-03-19OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBSOz Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-09-20MAINT-3172 fix rendering regressions from release mergedownGraham Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-07merge changes for DRTVWR-299Oz Linden