Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
Showing
- .gitignore 2 additions, 5 deletions.gitignore
- autobuild.xml 114 additions, 14 deletionsautobuild.xml
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/CMakeLists.txt 36 additions, 14 deletionsindra/CMakeLists.txt
- indra/cmake/00-Common.cmake 72 additions, 117 deletionsindra/cmake/00-Common.cmake
- indra/cmake/APR.cmake 39 additions, 48 deletionsindra/cmake/APR.cmake
- indra/cmake/Atmosphere.cmake 0 additions, 5 deletionsindra/cmake/Atmosphere.cmake
- indra/cmake/Audio.cmake 11 additions, 37 deletionsindra/cmake/Audio.cmake
- indra/cmake/Boost.cmake 40 additions, 95 deletionsindra/cmake/Boost.cmake
- indra/cmake/BuildPackagesInfo.cmake 1 addition, 1 deletionindra/cmake/BuildPackagesInfo.cmake
- indra/cmake/BuildVersion.cmake 17 additions, 27 deletionsindra/cmake/BuildVersion.cmake
- indra/cmake/CEFPlugin.cmake 7 additions, 11 deletionsindra/cmake/CEFPlugin.cmake
- indra/cmake/CMakeLists.txt 67 additions, 97 deletionsindra/cmake/CMakeLists.txt
- indra/cmake/CURL.cmake 10 additions, 15 deletionsindra/cmake/CURL.cmake
- indra/cmake/Copy3rdPartyLibs.cmake 65 additions, 53 deletionsindra/cmake/Copy3rdPartyLibs.cmake
- indra/cmake/DBusGlib.cmake 8 additions, 23 deletionsindra/cmake/DBusGlib.cmake
- indra/cmake/DragDrop.cmake 6 additions, 10 deletionsindra/cmake/DragDrop.cmake
- indra/cmake/EXPAT.cmake 16 additions, 19 deletionsindra/cmake/EXPAT.cmake
- indra/cmake/ExamplePlugin.cmake 1 addition, 11 deletionsindra/cmake/ExamplePlugin.cmake
- indra/cmake/FMODSTUDIO.cmake 25 additions, 15 deletionsindra/cmake/FMODSTUDIO.cmake
Loading
Please register or sign in to comment