livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for latest fixes from nat

master
Oz Linden 2016-12-06 12:22:55 -05:00
parent 295a4c63b4 780120dc46
commit 59f2055c8d
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/cmake/BuildPackagesInfo.cmake
View File

@ -2,9 +2,16 @@
# Construct the version and copyright information based on package data.
include(Python)
# packages-formatter.py runs autobuild install --versions, which needs to know
# the build_directory, which (on Windows) depends on AUTOBUILD_ADDRSIZE.
# Within an autobuild build, AUTOBUILD_ADDRSIZE is already set. But when
# building in an IDE, it probably isn't. Set it explicitly using
# run_build_test.py.
add_custom_command(OUTPUT packages-info.txt
COMMENT Generating packages-info.txt for the about box
MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml
DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py "${VIEWER_CHANNEL}" "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}" > packages-info.txt
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/cmake/run_build_test.py -DAUTOBUILD_ADDRSIZE=${ADDRESS_SIZE}
${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py "${VIEWER_CHANNEL}" "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}" > packages-info.txt
)

3
indra/llcorehttp/tests/test_llcorehttp_peer.py
View File

@ -40,7 +40,6 @@ try:
except ImportError:
from StringIO import StringIO
from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
from SocketServer import ThreadingMixIn
from llbase.fastest_elementtree import parse as xml_parse
from llbase import llsd
@ -274,7 +273,7 @@ class TestHTTPRequestHandler(BaseHTTPRequestHandler):
# Suppress error output as well
pass
class Server(ThreadingMixIn, HTTPServer):
class Server(HTTPServer):
# This pernicious flag is on by default in HTTPServer. But proper
# operation of freeport() absolutely depends on it being off.
allow_reuse_address = False

12
indra/media_plugins/libvlc/CMakeLists.txt
View File

@ -61,7 +61,17 @@ target_link_libraries(media_plugin_libvlc
add_dependencies(media_plugin_libvlc
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
##${LLCOMMON_LIBRARIES}
# Just say 'llcommon' here. LLCOMMON_LIBRARIES is specified for use in
# target_link_libraries: it includes several Boost libraries, which are
# absolutely NOT dependencies in the sense intended here. Those Boost
# library macros, in turn, specify 'debug' and 'optimized' and a different
# library name for each, producing several wordy errors:
# Policy CMP0046 is not set: Error on non-existent dependency in
# add_dependencies.
# Really, the only dependency we should mention from LLCOMMON_LIBRARIES is
# llcommon itself.
llcommon
)
if (WINDOWS)