summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2017-03-06Automated merge with tip of lindenlab/viewer64callum@lindenlab.com
2017-02-22correct merge error in BuildVersion.cmakeOz Linden
2017-02-22use AUTOBUILD_BUILD_ID value for revision if available (requires autobuild ↵Oz Linden
1.1.4)
2017-02-21First round of changes to replace LLCEFLib with Dullahan. Mostly Windows ↵Callum Prentice
changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested
2017-02-15improve dependency declarations for packages-info and other settings filesOz Linden
2017-02-15MAINT-7130: suppress stdout from run_build_tests byOz Linden
converting to logging so that stdout from its command can be captured cleanly Make the default be to not print anything
2017-02-15convert run_build_tests to use argparse rather than optparseOz Linden
2017-01-30Automated merge with head of lindenlab/nat_viewer64Callum Linden
2017-01-30DRTVWR-418: Merge from oz_viewer64Nat Goodspeed
2017-01-27First batch of changes to add LibVLC media plugin to macOS viewer. Plugin ↵Callum Linden
fails to start because of an as-yet undiagnosed issue with VLC plugin files related to their extyended attributes
2017-01-05DRTVWR-418, MAINT-7038: Don't add double quotes to channel name.Nat Goodspeed
The CMake directive that passes VIEWER_CHANNEL to the C++ compiler as LL_VIEWER_CHANNEL was enclosing the VIEWER_CHANNEL value in double quotes. At this point in history, those double quotes literally become part of the LL_VIEWER_CHANNEL value, causing the viewer to construct a bad Viewer Version Manager query containing those double quotes. Removing them fixes the query.
2016-12-22DRTVWR-418: Emit less confusing error message when LL_BUILD not set.Nat Goodspeed
When LL_BUILD is not in the environment at autobuild configure time, important macros such as LL_WINDOWS aren't set. That means that platform-dependent macros such as LL_TYPEOF() aren't defined, which can produce obscure errors like this: indra\llcommon\llunittype.h(51): error C2226: syntax error : unexpected type 'S' (packages\llphysicsextensions\stub\LLPhysicsExtensionsStubImpl.cpp) 10> indra\llcommon\llunittype.h(52) : see reference to class template instantiation 'LLResultTypeAdd<S,T>' being compiled Make the CMake logic fail with a more readily-understood error in that case.
2016-12-22merge changes from project trunkOz Linden
2016-12-20don't add llcorehttp to all testsOz Linden
2016-12-20DRTVWR-418: Fix libhunspell references to reflect current package.Nat Goodspeed
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-16Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2016-12-16merge updates from natOz Linden
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-14DRTVWR-418: Derive certain CMAKE_XCODE_etc. vars from LL_BUILD.Nat Goodspeed
2016-12-12DRTVWR-418: Align minimum OS X version with viewer-build-variables.Nat Goodspeed
2016-12-10DRTVWR-418: Update some copy commands for 3p library versions.Nat Goodspeed
2016-12-09move some cmake messages that are not warnings from stderr to stdoutOz Linden
2016-12-07Automated merge with tip of lindenlab/oz_viewer64Callum Prentice
2016-12-06merge fix for test runner failureOz Linden
2016-12-06Merge with fix to run packages-formatterCallum Prentice
2016-12-06DRTVWR-418: Run packages-formatter via Python interpreter for Windows.Nat Goodspeed
2016-12-06merge changes for latest fixes from natOz Linden
2016-12-06DRTVWR-418: Set AUTOBUILD_ADDRSIZE for packages-formatter.py.Nat Goodspeed
This handles the case of building within an IDE, in which AUTOBUILD_ADDRSIZE isn't already set.
2016-12-05update copying of fmodex{64}.dll to right place for 32/64 bit buildsCallum Prentice
2016-12-05suppress VS linker warning about unfound pdb filesOz Linden
2016-12-02add viewer channel and version to the beginning of the About box Licenses ↵Oz Linden
information
2016-11-28DRTVWR-418: Revert one more openjp2.dll reference to openjpeg.dll.Nat Goodspeed
2016-11-22DRTVWR-418: Use correct spelling for glh_linear package.Nat Goodspeed
2016-11-19DRTVWR-418: Change to libc++ on Mac, remove reminder warning.Nat Goodspeed
2016-11-17DRTVWR-418: Add warning about changing to libc++ on Mac.Nat Goodspeed
2016-11-16DRTVWR-418: Try to make the OSX architecture match computed ARCHNat Goodspeed
which in turn depends on ADDRESS_SIZE.
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: Compute ADDRESS_SIZE from arch if not specified.Nat Goodspeed
Migrate the logic formerly used only for LINUX to detect whether ADDRESS_SIZE is set to 32 or 64, and if not, detect a default for the platform. But instead of using uname -m, use python's platform.machine(). On Windows, stop forcing ARCH to i686 and ADDRESS_SIZE to 32. On Mac, reset default to x86_64 instead of i386; stop forcing ADDRESS_SIZE to 32.
2016-11-16DRTVWR-418: pull in new viewer-release via viewer64Nat Goodspeed
2016-11-16Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat 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-11-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-10-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
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-06-29merge changes for buildscriptsOz Linden
2016-06-09move build number informative output to stdoutOz Linden
2016-06-01Linux: Use media_plugin_libvlc for media playback.Nicky
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 00:03:45 +0000