diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-15 11:45:03 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-15 11:45:03 -0400 |
| commit | f26ba0f0eccce2e6b66554dc1132ff29e6d0f3b1 (patch) | |
| tree | 7c6e558f4811b653607255aa20f2434675f737ae /indra | |
| parent | bb757b937c6cde205c59a80e83d8f970523edeeb (diff) | |
SL-820: Make bugsplat.cmake and its symbols conditional.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index ad65301d4d..d9c267324b 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -8,7 +8,9 @@ include(00-Common) include(Linking) include(Boost) -include(bugsplat) +if (DEFINED ENV{BUGSPLAT_DB}) + include(bugsplat) +endif (DEFINED ENV{BUGSPLAT_DB}) include(BuildPackagesInfo) include(BuildVersion) include(CMakeCopyIfDifferent) @@ -95,8 +97,13 @@ include_directories( ${LIBS_PREBUILT_DIR}/include/collada/1.4 ${LLAPPEARANCE_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} + ) + +if (DEFINED ENV{BUGSPLAT_DB}) + include_directories( ${BUGSPLAT_INCLUDE_DIR} ) +endif (DEFINED ENV{BUGSPLAT_DB}) include_directories(SYSTEM ${LLCOMMON_SYSTEM_INCLUDE_DIRS} @@ -1381,9 +1388,14 @@ if (DARWIN) ${AGL_LIBRARY} ${IOKIT_LIBRARY} ${COREAUDIO_LIBRARY} - ${BUGSPLAT_LIBRARIES} ) + if (DEFINED ENV{BUGSPLAT_DB}) + list(APPEND viewer_LIBRARIES + ${BUGSPLAT_LIBRARIES} + ) + endif (DEFINED ENV{BUGSPLAT_DB}) + # Add resource files to the project. set(viewer_RESOURCE_FILES secondlife.icns @@ -1993,8 +2005,13 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLPHYSICS_LIBRARIES} ${LLPHYSICSEXTENSIONS_LIBRARIES} ${LLAPPEARANCE_LIBRARIES} + ) + +if (DEFINED ENV{BUGSPLAT_DB}) + target_link_libraries(${VIEWER_BINARY_NAME} ${BUGSPLAT_LIBRARIES} ) +endif (DEFINED ENV{BUGSPLAT_DB}) set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to artwork files.") |