diff options
| author | Kyle Ambroff <ambroff@lindenlab.com> | 2009-02-06 08:40:02 +0000 |
|---|---|---|
| committer | Kyle Ambroff <ambroff@lindenlab.com> | 2009-02-06 08:40:02 +0000 |
| commit | d1f4f89c64280d96ebc3cf1a113fd7b4787c1437 (patch) | |
| tree | a8569686fa641a4a89d26e3e04eda3c33d8a45dd /indra | |
| parent | 5ba5157f8a1337ae0486eae5ddb7b0d0506dc9e8 (diff) | |
DEV-26150 (VWR-11474): CMake 2.6.2 adds multiple `-lndofdev' when linking
secondlife-bin on Linux.
CMake will insert multiple -lndofdev parameters into the Makefile that
links secondlife-bin IFF ${NDOF_LIBRARY} is listed *after* Xinerama in
the target_link_libraries() call in indra/newview/CMakeLists.txt file.
Moving the reference to NDOF_LIBRARY above viewer_LIBRARIES seems to fix
it, and doesn't break Windows or MacOS.
Not reviewed.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 9ec838ad46..8de3ec0fc7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1418,6 +1418,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LSCRIPT_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} + ${NDOF_LIBRARY} ${viewer_LIBRARIES} ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_REGEX_LIBRARY} @@ -1429,7 +1430,6 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${SDL_LIBRARY} ${SMARTHEAP_LIBRARY} ${UI_LIBRARIES} - ${NDOF_LIBRARY} ${QUICKTIME_LIBRARY} ${WINDOWS_LIBRARIES} ${XMLRPCEPI_LIBRARIES} |