Commit Graph

18 Commits (master)

Author SHA1 Message Date
Ansariel 1fc3aaff9b Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/cmake/00-Common.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/BuildVersion.cmake
#	indra/cmake/CEFPlugin.cmake
#	indra/cmake/CMakeLists.txt
#	indra/cmake/CURL.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/DBusGlib.cmake
#	indra/cmake/DragDrop.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/cmake/FindHUNSPELL.cmake
#	indra/cmake/FindJsonCpp.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FindURIPARSER.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/GLH.cmake
#	indra/cmake/Hunspell.cmake
#	indra/cmake/JsonCpp.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/cmake/LLPlugin.cmake
#	indra/cmake/LLWindow.cmake
#	indra/cmake/Linking.cmake
#	indra/cmake/MESHOPTIMIZER.cmake
#	indra/cmake/MediaPluginBase.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/cmake/OpenGL.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/OpenSSL.cmake
#	indra/cmake/PNG.cmake
#	indra/cmake/Tracy.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/Variables.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/cmake/ZLIBNG.cmake
#	indra/cmake/bugsplat.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/linux_crash_logger/CMakeLists.txt
#	indra/llaudio/CMakeLists.txt
#	indra/llcommon/CMakeLists.txt
#	indra/llcommon/llapp.cpp
#	indra/llcorehttp/CMakeLists.txt
#	indra/llimagej2coj/CMakeLists.txt
#	indra/llinventory/CMakeLists.txt
#	indra/llmath/CMakeLists.txt
#	indra/llmath/llcalcparser.h
#	indra/llmessage/CMakeLists.txt
#	indra/llprimitive/CMakeLists.txt
#	indra/llrender/CMakeLists.txt
#	indra/llrender/llglslshader.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/media_plugins/CMakeLists.txt
#	indra/media_plugins/base/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llxmlrpclistener.cpp
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/viewer_manifest.py
#	indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
Nicky 767464a262 Adapt gnerator expression usage to work on OSX. 2022-05-07 02:19:51 +02:00
Nicky 985730a52c Merge. 2017-05-18 17:40:24 +02:00
Nat Goodspeed 614c75e110 DRTVWR-418: Silence some Mac build warnings.
Whatever we were trying to do with LLSharedLibs.cmake hasn't worked on the Mac
for a long time, and trying to fix it only digs up more problems. Skip it:
we've already worked around it.

Update the media_plugins_example CMakeLists.txt to eliminate some CMake
non-existent dependency warnings.
2017-05-03 15:58:21 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Nicky 40621133eb (Windows) Stop DeploySharedLibs from copying dependencies into the drives root (\). 2016-01-06 19:17:48 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
JJ Linden 5cb5c267ca fixes for cmake warnings about policy changes. could not fully test these changes 2014-10-13 12:46:55 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Oz Linden 61c3b55bd0 expand tabs for coding policy 2011-10-11 09:26:40 -04:00
Boroondas Gupte (patch by Aleric Inglewood) 942823db09 OPEN-38: Fixes for viewer-autobuild for standalone
Reviewed at https://codereview.secondlife.com/r/167/
(The patch to create this commit was taken from there, too. That patch
was made relative to 5f0ab9443ece. Applied cleanly to the (earlier)
43b4b7927c00.)

Also fixes OPEN-36
2011-04-03 14:34:44 +02:00
Nat Goodspeed edb999ab03 Remove tab chars inherited with file... 2010-06-21 17:02:16 -04:00
Nat Goodspeed 4e538adca4 EXT-7926: fix broken LD_LIBRARY_PATH handling on Windows.
Recent checkins introduced two different CMake macros SET_TEST_LIST (which
returned a CMake list of PATH directory strings) and SET_TEST_PATH (which
returned a single platform-appropriate PATH string). On Windows, whose
path-separator character is ';', SET_TEST_PATH interacted badly with CMake: in
CMake, a single string containing ';' characters is indistinguishable from a
list of strings.
Eliminate the return-single-string form, redirecting the name SET_TEST_PATH to
the macro that returns a CMake list. Make LL_TEST_COMMAND expect a list value,
prepending each directory string with run_build_test.py's -l switch.
2010-06-21 12:18:16 -04:00
Nat Goodspeed 477fb26c1e Centralize LD_LIBRARY_PATH logic with new SET_TEST_PATH macro.
Add ${SHARED_LIB_STAGING_DIR_RELEASE} to LD_LIBRARY_PATH for executing tests:
otherwise Debug-build tests can't find (e.g.) the aprutil DLL, for which we
don't build/package a debug variant.
Leverage discovery that a CMake macro can accept a target variable name
argument for LL_TEST_COMMAND macro.
2010-06-18 17:38:21 -04:00
palange ec32310c86 Removed search_dirs and dst_path arguments from ll_deploy_sharedlibs_command()
Fixed mac breakage.
2009-11-05 17:51:50 -08:00
Mark Palange (Mani) 9e69702fe7 Added calls to ll_deploy_sharedlibs_command
Using viewer_manifest.py for windows dependency deployment during build.
Added SHARED_LIBS_REL_PATH var to cmake cache.
2009-11-05 08:52:07 -08:00
Mark Palange (Mani) 2a79326ff6 Removed tabs. Fixed errant 'else(APPLE)' 2009-11-02 14:23:40 -08:00
palange cf0c0e1824 Added build time script to help deploy shared libs for an arbitrary executable.
indra/cmake/DeploySharedLibs.cmake is the script.
LLSharedLibs.cmake contains a macro to ease adding DeployShaerdLibs to a targets build.
Example usage to the mac-crash-reporter. Multiplatform and more to come soon.
Reviewed by brad.
2009-11-02 12:12:32 -08:00