SL-821: Move BugSplat includes/libs from llcommon to newview.
No C++ source in llcommon references any of the BugSplat code.meow-7.2.2
parent
2fb39cb45f
commit
3de5bab174
|
|
@ -13,7 +13,6 @@ include(GoogleBreakpad)
|
|||
include(Copy3rdPartyLibs)
|
||||
include(ZLIB)
|
||||
include(URIPARSER)
|
||||
include(BUGSPLAT)
|
||||
include(BuildVersion)
|
||||
|
||||
include_directories(
|
||||
|
|
@ -23,7 +22,6 @@ include_directories(
|
|||
${ZLIB_INCLUDE_DIRS}
|
||||
${BREAKPAD_INCLUDE_DIRECTORIES}
|
||||
${URIPARSER_INCLUDE_DIRS}
|
||||
${BUGSPLAT_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
# add_executable(lltreeiterators lltreeiterators.cpp)
|
||||
|
|
@ -301,7 +299,6 @@ target_link_libraries(
|
|||
${BOOST_SYSTEM_LIBRARY}
|
||||
${GOOGLE_PERFTOOLS_LIBRARIES}
|
||||
${URIPARSER_LIBRARIES}
|
||||
${BUGSPLAT_LIBRARIES}
|
||||
)
|
||||
|
||||
if (DARWIN)
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ project(viewer)
|
|||
|
||||
include(00-Common)
|
||||
include(Boost)
|
||||
include(bugsplat)
|
||||
include(BuildPackagesInfo)
|
||||
include(BuildVersion)
|
||||
include(CMakeCopyIfDifferent)
|
||||
|
|
@ -91,6 +92,7 @@ include_directories(
|
|||
${LIBS_PREBUILT_DIR}/include/collada/1.4
|
||||
${LLAPPEARANCE_INCLUDE_DIRS}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${BUGSPLAT_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
include_directories(SYSTEM
|
||||
|
|
@ -1976,6 +1978,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
|
|||
${LLPHYSICS_LIBRARIES}
|
||||
${LLPHYSICSEXTENSIONS_LIBRARIES}
|
||||
${LLAPPEARANCE_LIBRARIES}
|
||||
${BUGSPLAT_LIBRARIES}
|
||||
)
|
||||
|
||||
set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
|
||||
|
|
|
|||
Loading…
Reference in New Issue