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.
meow-7.2.2
parent
5ba5157f8a
commit
d1f4f89c64
|
|
@ -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}
|
||||
|
|
|
|||
Loading…
Reference in New Issue