fce64f8f12
Adds finding and using libjsoncpp. Note that the old cmake file found libjson, not the same thing. Adds Debug Setting WebProfileNonProductionURL (next to already existing WebProfileURL) to mimic V3's behavior and use a different URL for aditi. These Debug Settings are using by (the new) getProfileURL() (copied from V3 with just a minor fix). Adds HippoGridInfo::isInProductionGrid() next to the existing LLViewerLogin::isInProductionGrid that always returned true. The former should only be called SL grids and then only returns true for agni (and false for aditi et al). The latter was changed to now always return true except on SL when the grid isn't agni. The first is used for SL-only cases, the latter for things like colors and for godmode decision logic. V3's llwebprofile.cpp was fixed to compile on singu, with only real difference that I dropped the Content-Type headers for the GET methods.
23 lines
542 B
CMake
23 lines
542 B
CMake
# -*- cmake -*-
|
|
|
|
include(Prebuilt)
|
|
|
|
set(JSONCPP_FIND_QUIETLY OFF)
|
|
set(JSONCPP_FIND_REQUIRED ON)
|
|
|
|
if (STANDALONE)
|
|
include(FindJsonCpp)
|
|
else (STANDALONE)
|
|
use_prebuilt_binary(jsoncpp)
|
|
if (WINDOWS)
|
|
set(JSONCPP_LIBRARIES
|
|
debug json_vc${MSVC_SUFFIX}d
|
|
optimized json_vc${MSVC_SUFFIX})
|
|
elseif (DARWIN)
|
|
set(JSONCPP_LIBRARIES json_linux-gcc-4.0.1_libmt)
|
|
elseif (LINUX)
|
|
set(JSONCPP_LIBRARIES jsoncpp)
|
|
endif (WINDOWS)
|
|
set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/jsoncpp)
|
|
endif (STANDALONE)
|