Merge with viewer-2.0.0-3 branch

6 files changed, 150 insertions, 148 deletions

diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake
index d406f3785b..29724ee2fc 100644
--- a/indra/cmake/DirectX.cmake
+++ b/indra/cmake/DirectX.cmake
@@ -3,6 +3,7 @@
 if (VIEWER AND WINDOWS)
   find_path(DIRECTX_INCLUDE_DIR dxdiag.h
             "$ENV{DXSDK_DIR}/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include"
@@ -23,6 +24,7 @@ if (VIEWER AND WINDOWS)
 
   find_path(DIRECTX_LIBRARY_DIR dxguid.lib
             "$ENV{DXSDK_DIR}/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86"
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index aff65cb53e..355ecb58f0 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -6,9 +6,11 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(google)
   if (WINDOWS)
+    use_prebuilt_binary(google-perftools)
     set(TCMALLOC_LIBRARIES 
         debug libtcmalloc_minimal-debug
-        optimized libtcmalloc_minimal-debug)
+        optimized libtcmalloc_minimal)
+    set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (WINDOWS)
   if (LINUX)
     set(TCMALLOC_LIBRARIES tcmalloc)
@@ -27,6 +29,10 @@ endif (GOOGLE_PERFTOOLS_FOUND)
 # XXX Disable temporarily, until we have compilation issues on 64-bit
 # Etch sorted.
 set(USE_GOOGLE_PERFTOOLS OFF)
+if (WINDOWS)
+    # *TODO -reenable this once we get server usage sorted out
+    #set(USE_GOOGLE_PERFTOOLS ON)
+endif (WINDOWS)
 
 if (USE_GOOGLE_PERFTOOLS)
   set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 6eeff45afe..4a61725e09 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -1,160 +1,150 @@
 # -*- cmake -*-
 
-INCLUDE(APR)
-INCLUDE(Pth)
-INCLUDE(LLMath)
-
-MACRO(ADD_BUILD_TEST_NO_COMMON name parent)
-#   MESSAGE("${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
-    IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
-        SET(no_common_libraries
-            ${APRUTIL_LIBRARIES}
-            ${APR_LIBRARIES}
-            ${PTHREAD_LIBRARY}
-            ${WINDOWS_LIBRARIES}
-            )
-        SET(no_common_source_files
-            ${name}.cpp
-            tests/${name}_test.cpp
-            ${CMAKE_SOURCE_DIR}/test/test.cpp
-            )
-        ADD_BUILD_TEST_INTERNAL("${name}" "${parent}" "${no_common_libraries}" "${no_common_source_files}")
-    ENDIF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
-ENDMACRO(ADD_BUILD_TEST_NO_COMMON name parent)
-
-
-MACRO(ADD_BUILD_TEST name parent)
-    # optional extra parameter: list of additional source files
-    SET(more_source_files "${ARGN}")
-
-#   MESSAGE("${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
-    IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
-
-        SET(basic_libraries
-            ${LLCOMMON_LIBRARIES}
-            ${LLMATH_LIBRARIES}
-            ${APRUTIL_LIBRARIES}
-            ${APR_LIBRARIES}
-            ${PTHREAD_LIBRARY}
-            ${WINDOWS_LIBRARIES}
-            ${PTH_LIBRARIES}
-            )
-        SET(basic_source_files
-            ${name}.cpp
-            tests/${name}_test.cpp
-            ${CMAKE_SOURCE_DIR}/test/test.cpp
-            ${CMAKE_SOURCE_DIR}/test/lltut.cpp
-            ${more_source_files}
-            )
-        ADD_BUILD_TEST_INTERNAL("${name}" "${parent}" "${basic_libraries}" "${basic_source_files}")
-
-    ENDIF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/${name}_test.cpp")
-ENDMACRO(ADD_BUILD_TEST name parent)
-
-
-MACRO(ADD_VIEWER_BUILD_TEST name parent)
-    # This is just like the generic ADD_BUILD_TEST, but we implicitly
-    # add the necessary precompiled header .cpp file (anyone else find that
-    # oxymoronic?) because the MSVC build errors will NOT point you there.
-    ADD_BUILD_TEST("${name}" "${parent}" llviewerprecompiledheaders.cpp)
-ENDMACRO(ADD_VIEWER_BUILD_TEST name parent)
-
-
-MACRO(ADD_SIMULATOR_BUILD_TEST name parent)
-    ADD_BUILD_TEST("${name}" "${parent}" llsimprecompiledheaders.cpp)
-
-    if (WINDOWS)
-        SET_SOURCE_FILES_PROPERTIES(
-            "tests/${name}_test.cpp"
-            PROPERTIES
-            COMPILE_FLAGS "/Yullsimprecompiledheaders.h"
-        )
-    endif (WINDOWS)
-ENDMACRO(ADD_SIMULATOR_BUILD_TEST name parent)
-
-MACRO(ADD_BUILD_TEST_INTERNAL name parent libraries source_files)
-    # Optional additional parameter: pathname of Python wrapper script
-    SET(wrapper "${ARGN}")
-    #MESSAGE(STATUS "ADD_BUILD_TEST_INTERNAL ${name} wrapper = ${wrapper}")
-
-    SET(TEST_SOURCE_FILES ${source_files})
-    SET(HEADER "${name}.h")
-    set_source_files_properties(${HEADER}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-    LIST(APPEND TEST_SOURCE_FILES ${HEADER})
-    INCLUDE_DIRECTORIES("${LIBS_OPEN_DIR}/test")
-    ADD_EXECUTABLE(${name}_test ${TEST_SOURCE_FILES})
-    TARGET_LINK_LIBRARIES(${name}_test
-        ${libraries}
-        )
-
-    GET_TARGET_PROPERTY(TEST_EXE ${name}_test LOCATION)
-    SET(TEST_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}_test_ok.txt)
-
-    SET(run_needs ${name}_test)
-
-    IF ("${wrapper}" STREQUAL "")
-      SET(TEST_CMD ${TEST_EXE} --touch=${TEST_OUTPUT} --sourcedir=${CMAKE_CURRENT_SOURCE_DIR})
-    ELSE ("${wrapper}" STREQUAL "")
-      SET(TEST_CMD ${PYTHON_EXECUTABLE} ${wrapper} ${TEST_EXE} --touch=${TEST_OUTPUT} --sourcedir=${CMAKE_CURRENT_SOURCE_DIR})
-      SET(run_needs ${run_needs} ${wrapper})
-    ENDIF ("${wrapper}" STREQUAL "")
-
-    #MESSAGE(STATUS "ADD_BUILD_TEST_INTERNAL ${name} test_cmd  = ${TEST_CMD}")
+MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
+  # Given a project name and a list of sourcefiles (with optional properties on each),
+  # add targets to build and run the tests specified.
+  # ASSUMPTIONS:
+  # * this macro is being executed in the project file that is passed in
+  # * current working SOURCE dir is that project dir
+  # * there is a subfolder tests/ with test code corresponding to the filenames passed in
+  # * properties for each sourcefile passed in indicate what libs to link that file with (MAKE NO ASSUMPTIONS ASIDE FROM TUT)
+  #
+  # More info and examples at: https://wiki.secondlife.com/wiki/How_to_add_unit_tests_to_indra_code
+  #
+  # WARNING: do NOT modify this code without working with poppy or daveh -
+  # there is another branch that will conflict heavily with any changes here.
+
+  IF(LL_TEST_VERBOSE)
+    MESSAGE("LL_ADD_PROJECT_UNIT_TESTS UNITTEST_PROJECT_${project} sources: ${sources}")
+  ENDIF(LL_TEST_VERBOSE)
+
+  # Start with the header and project-wide setup before making targets
+  #project(UNITTEST_PROJECT_${project})
+  # Setup includes, paths, etc
+  SET(alltest_SOURCE_FILES
+    ${CMAKE_SOURCE_DIR}/test/test.cpp
+    )
+  SET(alltest_DEP_TARGETS
+    llcommon
+    llmath
+    )
+  SET(alltest_INCLUDE_DIRS
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LIBS_OPEN_DIR}/test
+    )
+  SET(alltest_LIBRARIES
+    ${PTHREAD_LIBRARY}
+    ${WINDOWS_LIBRARIES}
+    )
+  # Headers, for convenience in targets.
+  SET(alltest_HEADER_FILES
+    ${CMAKE_SOURCE_DIR}/test/test.h
+    )
+
+  # start the source test executable definitions
+  SET(${project}_TEST_OUTPUT "")
+  FOREACH (source ${sources})
+    STRING( REGEX REPLACE "(.*)\\.[^.]+$" "\\1" name ${source} )
+    STRING( REGEX REPLACE ".*\\.([^.]+)$" "\\1" extension ${source} )
+    IF(LL_TEST_VERBOSE)
+      MESSAGE("LL_ADD_PROJECT_UNIT_TESTS UNITTEST_PROJECT_${project} individual source: ${source} (${name}.${extension})")
+    ENDIF(LL_TEST_VERBOSE)
+
+    #
+    # Per-codefile additional / external source, header, and include dir property extraction
+    #
+    # Source
+    GET_SOURCE_FILE_PROPERTY(${name}_test_additional_SOURCE_FILES ${source} LL_TEST_ADDITIONAL_SOURCE_FILES)
+    IF(${name}_test_additional_SOURCE_FILES MATCHES NOTFOUND)
+      SET(${name}_test_additional_SOURCE_FILES "")
+    ENDIF(${name}_test_additional_SOURCE_FILES MATCHES NOTFOUND)
+    SET(${name}_test_SOURCE_FILES ${source} tests/${name}_test.${extension} ${alltest_SOURCE_FILES} ${${name}_test_additional_SOURCE_FILES} )
+    IF(LL_TEST_VERBOSE)
+      MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_SOURCE_FILES ${${name}_test_SOURCE_FILES}")
+    ENDIF(LL_TEST_VERBOSE)
+    # Headers
+    GET_SOURCE_FILE_PROPERTY(${name}_test_additional_HEADER_FILES ${source} LL_TEST_ADDITIONAL_HEADER_FILES)
+    IF(${name}_test_additional_HEADER_FILES MATCHES NOTFOUND)
+      SET(${name}_test_additional_HEADER_FILES "")
+    ENDIF(${name}_test_additional_HEADER_FILES MATCHES NOTFOUND)
+    SET(${name}_test_HEADER_FILES ${name}.h ${${name}_test_additional_HEADER_FILES})
+    set_source_files_properties(${${name}_test_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE)
+    LIST(APPEND ${name}_test_SOURCE_FILES ${${name}_test_HEADER_FILES})
+    IF(LL_TEST_VERBOSE)
+      MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_HEADER_FILES ${${name}_test_HEADER_FILES}")
+    ENDIF(LL_TEST_VERBOSE)
+    # Include dirs
+    GET_SOURCE_FILE_PROPERTY(${name}_test_additional_INCLUDE_DIRS ${source} LL_TEST_ADDITIONAL_INCLUDE_DIRS)
+    IF(${name}_test_additional_INCLUDE_DIRS MATCHES NOTFOUND)
+      SET(${name}_test_additional_INCLUDE_DIRS "")
+    ENDIF(${name}_test_additional_INCLUDE_DIRS MATCHES NOTFOUND)
+    INCLUDE_DIRECTORIES(${alltest_INCLUDE_DIRS} ${name}_test_additional_INCLUDE_DIRS )
+    IF(LL_TEST_VERBOSE)
+      MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_INCLUDE_DIRS ${${name}_test_additional_INCLUDE_DIRS}")
+    ENDIF(LL_TEST_VERBOSE)
+
+    # Setup target
+    ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES})
+
+    #
+    # Per-codefile additional / external project dep and lib dep property extraction
+    #
+    # WARNING: it's REALLY IMPORTANT to not mix these. I guarantee it will not work in the future. + poppy 2009-04-19
+    # Projects
+    GET_SOURCE_FILE_PROPERTY(${name}_test_additional_PROJECTS ${source} LL_TEST_ADDITIONAL_PROJECTS)
+    IF(${name}_test_additional_PROJECTS MATCHES NOTFOUND)
+      SET(${name}_test_additional_PROJECTS "")
+    ENDIF(${name}_test_additional_PROJECTS MATCHES NOTFOUND)
+    # Libraries
+    GET_SOURCE_FILE_PROPERTY(${name}_test_additional_LIBRARIES ${source} LL_TEST_ADDITIONAL_LIBRARIES)
+    IF(${name}_test_additional_LIBRARIES MATCHES NOTFOUND)
+      SET(${name}_test_additional_LIBRARIES "")
+    ENDIF(${name}_test_additional_LIBRARIES MATCHES NOTFOUND)
+    IF(LL_TEST_VERBOSE)
+      MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_PROJECTS ${${name}_test_additional_PROJECTS}")
+      MESSAGE("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_LIBRARIES ${${name}_test_additional_LIBRARIES}")
+    ENDIF(LL_TEST_VERBOSE)
+    # Add to project
+    TARGET_LINK_LIBRARIES(PROJECT_${project}_TEST_${name} ${alltest_LIBRARIES} ${alltest_DEP_TARGETS} ${${name}_test_additional_PROJECTS} ${${name}_test_additional_LIBRARIES} )
+    
+    #
+    # Setup test targets
+    #
+    GET_TARGET_PROPERTY(TEST_EXE PROJECT_${project}_TEST_${name} LOCATION)
+    SET(TEST_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/PROJECT_${project}_TEST_${name}_ok.txt)
+    SET(TEST_CMD ${TEST_EXE} --touch=${TEST_OUTPUT} --sourcedir=${CMAKE_CURRENT_SOURCE_DIR})
+    # daveh - what configuration does this use? Debug? it's cmake-time, not build time. + poppy 2009-04-19
+    IF(LL_TEST_VERBOSE)
+      MESSAGE(STATUS "LL_ADD_PROJECT_UNIT_TESTS ${name} test_cmd  = ${TEST_CMD}")
+    ENDIF(LL_TEST_VERBOSE)
     SET(TEST_SCRIPT_CMD 
       ${CMAKE_COMMAND} 
       -DLD_LIBRARY_PATH=${ARCH_PREBUILT_DIRS}:/usr/lib
       -DTEST_CMD:STRING="${TEST_CMD}" 
       -P ${CMAKE_SOURCE_DIR}/cmake/RunBuildTest.cmake
       )
-
-    #MESSAGE(STATUS "ADD_BUILD_TEST_INTERNAL ${name} test_script  = ${TEST_SCRIPT_CMD}")
+    IF(LL_TEST_VERBOSE)
+      MESSAGE(STATUS "LL_ADD_PROJECT_UNIT_TESTS ${name} test_script  = ${TEST_SCRIPT_CMD}")
+    ENDIF(LL_TEST_VERBOSE)
+    # Add test 
     ADD_CUSTOM_COMMAND(
         OUTPUT ${TEST_OUTPUT}
         COMMAND ${TEST_SCRIPT_CMD}
-        DEPENDS ${run_needs}
+        DEPENDS PROJECT_${project}_TEST_${name}
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         )
+    # Why not add custom target and add POST_BUILD command?
+    # Slightly less uncertain behavior
+    # (OUTPUT commands run non-deterministically AFAIK) + poppy 2009-04-19
+    # > I did not use a post build step as I could not make it notify of a 
+    # > failure after the first time you build and fail a test. - daveh 2009-04-20
+    LIST(APPEND ${project}_TEST_OUTPUT ${TEST_OUTPUT})
+  ENDFOREACH (source)
+
+  # Add the test runner target per-project
+  # (replaces old _test_ok targets all over the place)
+  ADD_CUSTOM_TARGET(${project}_tests ALL DEPENDS ${${project}_TEST_OUTPUT})
+  ADD_DEPENDENCIES(${project} ${project}_tests)
+ENDMACRO(LL_ADD_PROJECT_UNIT_TESTS)
 
-    ADD_CUSTOM_TARGET(${name}_test_ok ALL DEPENDS ${TEST_OUTPUT})
-    IF (${parent})
-      ADD_DEPENDENCIES(${parent} ${name}_test_ok)
-    ENDIF (${parent})
-
-ENDMACRO(ADD_BUILD_TEST_INTERNAL name parent libraries source_files)
-
-
-MACRO(ADD_COMM_BUILD_TEST name parent wrapper)
-##  MESSAGE(STATUS "ADD_COMM_BUILD_TEST ${name} wrapper = ${wrapper}")
-    # optional extra parameter: list of additional source files
-    SET(more_source_files "${ARGN}")
-##  MESSAGE(STATUS "ADD_COMM_BUILD_TEST ${name} more_source_files = ${more_source_files}")
-
-    SET(libraries
-        ${LLMESSAGE_LIBRARIES}
-        ${LLMATH_LIBRARIES}
-        ${LLVFS_LIBRARIES}
-        ${LLCOMMON_LIBRARIES}
-        ${APRUTIL_LIBRARIES}
-        ${APR_LIBRARIES}
-        ${PTHREAD_LIBRARY}
-        ${WINDOWS_LIBRARIES}
-        )
-    SET(source_files
-        ${name}.cpp
-        tests/${name}_test.cpp
-        ${CMAKE_SOURCE_DIR}/test/test.cpp
-        ${CMAKE_SOURCE_DIR}/test/lltut.cpp
-        ${more_source_files}
-        )
-
-    ADD_BUILD_TEST_INTERNAL("${name}" "${parent}" "${libraries}" "${source_files}" "${wrapper}")
-ENDMACRO(ADD_COMM_BUILD_TEST name parent wrapper)
-
-MACRO(ADD_VIEWER_COMM_BUILD_TEST name parent wrapper)
-    # This is just like the generic ADD_COMM_BUILD_TEST, but we implicitly
-    # add the necessary precompiled header .cpp file (anyone else find that
-    # oxymoronic?) because the MSVC build errors will NOT point you there.
-##  MESSAGE(STATUS "ADD_VIEWER_COMM_BUILD_TEST ${name} wrapper = ${wrapper}")
-    ADD_COMM_BUILD_TEST("${name}" "${parent}" "${wrapper}" llviewerprecompiledheaders.cpp)
-ENDMACRO(ADD_VIEWER_COMM_BUILD_TEST name parent wrapper)
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index e9e3784e69..4cd3a9adb8 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -4,6 +4,7 @@ include(APR)
 include(Boost)
 include(EXPAT)
 include(ZLIB)
+include(GooglePerfTools)
 
 set(LLCOMMON_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llcommon
@@ -14,6 +15,8 @@ set(LLCOMMON_INCLUDE_DIRS
 
 set(LLCOMMON_LIBRARIES llcommon)
 
+add_definitions(${TCMALLOC_FLAG})
+
 set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a shared library.")
 if(LLCOMMON_LINK_SHARED)
     add_definitions(-DLL_COMMON_LINK_SHARED=1)
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 2bddb95178..eaa8a6dc29 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -42,6 +42,7 @@ if (WINDOWS)
       wldap32
       gdi32
       user32
+      dbghelp
       )
 else (WINDOWS)
   set(WINDOWS_LIBRARIES "")
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index adff01197f..6559051b5a 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -64,7 +64,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     if (ARCH STREQUAL x86_64)
       set(WORD_SIZE 64)
     else (ARCH STREQUAL x86_64)
-      set(WORD_SIZE 64)
+      set(WORD_SIZE 32)
     endif (ARCH STREQUAL x86_64)
   endif (WORD_SIZE EQUAL 32)