Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer

# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/cmake/00-Common.cmake

.gitignore

@@ -22,10 +22,8 @@ indra/.distcc
 build-vc80/
 build-vc100/
 build-vc120/
-build-vc[0-9]*-32*/
+build-vc*-32/
-build-vc[0-9]*-64*/
+build-vc*-64/
-build-vc160-64/
-build-vc170-64/
 indra/CMakeFiles
 indra/build-vc[0-9]*
 indra/lib/mono/1.0/*.dll

indra/cmake/Copy3rdPartyLibs.cmake

@@ -184,15 +184,6 @@ if(WINDOWS)
     endforeach()
 
 elseif(DARWIN)
-    # Support our "@executable_path/../Resources" load path for executables
-    # that end up in any of the above SHARED_LIB_STAGING_DIR_MUMBLE
-    # directories.
-    # Cannot use ${SHARED_LIB_STAGING_DIR} here as it used a generator expression and tha this not
-    # supported by file(...)
-    file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/sharedlibs/Release/Resources")
-    file(CREATE_LINK "${CMAKE_BINARY_DIR}/sharedlibs/Release/Resources" "${CMAKE_BINARY_DIR}/sharedlibs/Resources"
-         SYMBOLIC)
-
     set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(slvoice_files SLVoice)
     set(vivox_libs
@@ -333,3 +324,12 @@ add_custom_target(
         stage_third_party_libs ALL
         DEPENDS ${third_party_targets}
 )
+
+if(DARWIN)
+    # Support our "@executable_path/../Resources" load path for executables
+    # that end up in any of the above SHARED_LIB_STAGING_DIR_MUMBLE
+    # directories.
+    add_custom_command( TARGET stage_third_party_libs POST_BUILD
+            COMMAND cmake -E create_symlink ${SHARED_LIB_STAGING_DIR} ${CMAKE_BINARY_DIR}/sharedlibs/Resources
+            )
+endif()

indra/newview/CMakeLists.txt

@@ -75,6 +75,9 @@ if (NOT HAVOK_TPV)
    endif()
    if( TARGET llphysicsextensions )
       target_link_libraries(llphysicsextensions llrender )
+      if (DARWIN)
+        target_compile_options( llphysicsextensions  PRIVATE -Wno-unused-local-typedef)
+      endif (DARWIN)
    endif()
 endif (NOT HAVOK_TPV)
 
@@ -2293,7 +2296,7 @@ if (WINDOWS)
         )
 
       add_custom_target(llpackage ALL DEPENDS
-              ${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<BOOL:${LL_GENERATOR_IS_MULTI_CONFIG}>,$<CONFIG>,>/touched.bat
+              ${CMAKE_CFG_INTDIR}/touched.bat
         )
         # temporarily disable packaging of event_host until hg subrepos get
         # sorted out on the parabuild cluster...

indra/test/CMakeLists.txt

@@ -76,15 +76,6 @@ if (WINDOWS)
           LINK_FLAGS "/NODEFAULTLIB:LIBCMT"
           LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
           )
-elseif (DARWIN)
-  # Support our "@executable_path/../Resources" load path for our test
-  # executable. This SHOULD properly be "$<TARGET_FILE_DIR:lltest>/Resources",
-  # but the CMake $<TARGET_FILE_DIR> generator expression isn't evaluated by
-  # CREATE_LINK, so fudge it.
-  # Make sure the symlink's parent directory exists...
-  file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/test")
-  file(CREATE_LINK "../sharedlibs/Release/Resources" "${CMAKE_BINARY_DIR}/test/Resources"
-       SYMBOLIC)
 endif (WINDOWS)
 
 set(TEST_EXE $<TARGET_FILE:lltest>)
@@ -113,4 +104,13 @@ set(test_results ${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt)
 # developers choose to disable LL_TESTS.
 if (LL_TESTS)  
     add_custom_target(tests_ok ALL DEPENDS ${test_results})
+    if(DARWIN)
+      # Support our "@executable_path/../Resources" load path for our test
+      # executable. This SHOULD properly be "$<TARGET_FILE_DIR:lltest>/Resources",
+      # but the CMake $<TARGET_FILE_DIR> generator expression isn't evaluated by
+      # CREATE_LINK, so fudge it.
+      add_custom_command( TARGET lltest POST_BUILD
+              COMMAND cmake -E create_symlink ${SHARED_LIB_STAGING_DIR} ${CMAKE_BINARY_DIR}/test/Resources
+              )
+    endif()
 endif (LL_TESTS)