From d4b6ece24b567f9df086697d9f1d1f3d0f099394 Mon Sep 17 00:00:00 2001 From: siana Date: Mon, 21 Mar 2011 04:17:00 +0100 Subject: [PATCH] Unbotch jsoncpp --- indra/cmake/JsonCpp.cmake | 44 +++++++++++++++++++-------------------- install.xml | 4 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index b4fb420ea..552fc19fc 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -1,22 +1,22 @@ -# -*- cmake -*- - -include(Prebuilt) - -set(JSONCPP_FIND_QUIETLY ON) -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_mac-universal-gcc_libmt) - elseif (LINUX) - set(JSONCPP_LIBRARIES jsoncpp) - endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) -endif (STANDALONE) +# -*- cmake -*- + +include(Prebuilt) + +set(JSONCPP_FIND_QUIETLY ON) +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_mac-universal-gcc_libmt) + elseif (LINUX) + set(JSONCPP_LIBRARIES jsoncpp) + endif (WINDOWS) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) +endif (STANDALONE) diff --git a/install.xml b/install.xml index ba77cc8e3..ae6a04657 100644 --- a/install.xml +++ b/install.xml @@ -785,9 +785,9 @@ windows md5sum - e82faeae2942dd183c51a7d77f2372fb + 91e081c4b7b4949c4e53849182a42370 url - https://github.com/downloads/siana/SingularityViewer/jsoncpp-0.5.0-windows-20110316.tar.bz2 + https://github.com/downloads/siana/SingularityViewer/jsoncpp-0.5.0-windows-20110320.tar.bz2