From 6c3d44449032e386c2b4163c3635f1fe6934e5d7 Mon Sep 17 00:00:00 2001 From: callum Date: Fri, 10 Feb 2012 14:02:09 -0800 Subject: EXP-1889 FIX As a Second Life viewer developer, I would like a tool that helps me find memory leaks. --- indra/cmake/VisualLeakDetector.cmake | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 indra/cmake/VisualLeakDetector.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/VisualLeakDetector.cmake b/indra/cmake/VisualLeakDetector.cmake new file mode 100644 index 0000000000..d3ba554e46 --- /dev/null +++ b/indra/cmake/VisualLeakDetector.cmake @@ -0,0 +1,15 @@ +# -*- cmake -*- + +if (VIEWER) + + set(INCLUDE_VLD_CMAKE OFF CACHE BOOL "Build the Windows viewer with Visual Leak Detector turned on or off") + + if (INCLUDE_VLD_CMAKE) + + if (WINDOWS) + add_definitions(-DINCLUDE_VLD=1) + endif (WINDOWS) + + endif (INCLUDE_VLD_CMAKE) + +endif (VIEWER) -- cgit v1.3 From ddbac6dbe42b02775d57bd7a9ac82f9b7920559b Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Tue, 28 Feb 2012 17:21:52 +0200 Subject: EXP-1633 FIXED Updated llqtwebkit package for Linux and WebKitLibPlugin build configuration. --- autobuild.xml | 4 ++-- indra/cmake/WebKitLibPlugin.cmake | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/cmake') diff --git a/autobuild.xml b/autobuild.xml index 9914be6867..91bc46267b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1218,9 +1218,9 @@ archive hash - c05a33ee8b6f253b5a744596dfc3707d + f50e5f0cc880c55b3f0f7e67dc8f7221 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20101013.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/250147/arch/Linux/installer/llqtwebkit-4.7.1-linux-20120228.tar.bz2 name linux diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 91b49e75d7..d9df78bfc8 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -70,9 +70,10 @@ elseif (LINUX) QtNetwork QtGui QtCore - qgif - qjpeg - jpeg + jscore +# qgif +# qjpeg +# jpeg fontconfig X11 Xrender -- cgit v1.3 From 1b832eaa4b5cbb9be2a3c92643ba62794931d1d2 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Tue, 24 Apr 2012 11:24:11 -0400 Subject: OPEN-54: correct JsonCpp include path --- doc/contributions.txt | 2 +- indra/cmake/JsonCpp.cmake | 2 +- indra/newview/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/doc/contributions.txt b/doc/contributions.txt index 5a24c43d5a..04edfb4bea 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -234,7 +234,7 @@ Borg Capalini Boroondas Gupte OPEN-29 OPEN-39 - OPEN-39 + OPEN-54 OPEN-99 SNOW-278 SNOW-503 diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 499b00fb44..7ad73e5683 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -18,5 +18,5 @@ else (STANDALONE) elseif (LINUX) set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") + set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json") endif (STANDALONE) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 7e6ffb35c3..9aaefa9c6a 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -47,7 +47,7 @@ include(CMakeCopyIfDifferent) include_directories( ${DBUSGLIB_INCLUDE_DIRS} - ${JSONCPP_INCLUDE_DIRS} + ${JSONCPP_INCLUDE_DIR} ${GLOD_INCLUDE_DIR} ${LLAUDIO_INCLUDE_DIRS} ${LLCHARACTER_INCLUDE_DIRS} -- cgit v1.3 From b18d21486a6391b5b6ed089d5337044503a5c610 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 25 Apr 2012 17:17:08 -0400 Subject: Try to suppress spurious Mac ld warnings (lib/release/Release dir). Mindful that some autobuild packages populate only packages/lib/release (rather than packages/lib/debug), Linking.cmake always appends packages/lib/release to CMake's link_directories() directive. But since CMake always appends CMAKE_BUILD_TYPE to those directories, we end up with a phantom packages/lib/release/Release directory on the search path. This would be harmless except that the Mac's 'ld' command produces a warning. These warnings quickly make TC's "Important Messages" output useless. Try appending packages/lib/release only when the build type isn't already Release. --- indra/cmake/Linking.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index c5f9e2c579..47f944f9a5 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -13,7 +13,7 @@ elseif (LINUX) set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin) elseif (DARWIN) set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs) - set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs/\$(CONFIGURATION)") + set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs") endif (WINDOWS) # Autobuild packages must provide 'release' versions of libraries, but may provide versions for @@ -33,7 +33,14 @@ else(WINDOWS OR DARWIN) set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER}) endif(WINDOWS OR DARWIN) -list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) +if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") + # When we're building something other than Release, append the + # packages/lib/release directory to deal with autobuild packages that don't + # provide (e.g.) lib/debug libraries. + list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) + message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}, extending AUTOBUILD_LIBS_INSTALL_DIRS") +endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") +message(STATUS "For ${CMAKE_BUILD_TYPE}, AUTOBUILD_LIBS_INSTALL_DIRS: ${AUTOBUILD_LIBS_INSTALL_DIRS}") link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS}) if (LINUX) -- cgit v1.3