diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-08 16:11:40 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-08 16:11:40 -0800 |
| commit | f459524d817e9084f8a037cfe0768d05ee34edbb (patch) | |
| tree | 7ab9d36ed0065d4237facd37a62763263aef6e2a | |
| parent | d681ea89d27e0e37d77c7f57c9bc66fda3f08f4e (diff) | |
| parent | 0836d1b1ae861ee7a226ba342166148a31cc5bdd (diff) | |
Merge
| -rw-r--r-- | indra/newview/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f18107f673..ff099710f1 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1643,7 +1643,14 @@ if (WINDOWS) endif (PACKAGE) endif (WINDOWS) +# *NOTE - this list is very sensitive to ordering, test carefully on all +# platforms if you change the releative order of the entries here. +# In particular, cmake 2.6.4 (when buidling with linux/makefile generators) +# appears to sometimes de-duplicate redundantly listed dependencies improperly. +# To work around this, higher level modules should be listed before the modules +# that they depend upon. -brad target_link_libraries(${VIEWER_BINARY_NAME} + ${UPDATER_LIBRARIES} ${LLAUDIO_LIBRARIES} ${LLCHARACTER_LIBRARIES} ${LLIMAGE_LIBRARIES} @@ -1680,7 +1687,6 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARIES} ${LLLOGIN_LIBRARIES} - ${UPDATER_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES} ) |