diff options
author | Rider Linden <rider@lindenlab.com> | 2016-03-07 10:24:39 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-03-07 10:24:39 -0800 |
commit | d51a5a615ab4c1c52b4e8c2eaa1f88bf785f3f66 (patch) | |
tree | cb22850d39b2ac4240279c1b7b6c0bb70248de70 /indra/llcorehttp | |
parent | 6a20679c683f8da7888e7569a6e3f96eb6ba7a15 (diff) | |
parent | 8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff) |
Merge
Diffstat (limited to 'indra/llcorehttp')
-rwxr-xr-x | indra/llcorehttp/CMakeLists.txt | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 4aecf61bd7..0bb0348d26 100755 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -144,6 +144,43 @@ if (LL_TESTS) "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py" ) +if (DARWIN) + # Path inside the app bundle where we'll need to copy libraries + set(LL_TEST_DESTINATION_DIR + ${CMAKE_SOURCE_DIR}/../build-darwin-i386/sharedlibs/Resources + ) + + # Create the Contents/Resources directory + add_custom_command( + TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD + COMMAND ${CMAKE_COMMAND} + ARGS + -E + make_directory + ${LL_TEST_DESTINATION_DIR} + COMMENT "Creating Resources directory in app bundle." + ) + + # Copy the required libraries to the package app + add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libapr-1.0.dylib ${LL_TEST_DESTINATION_DIR} + DEPENDS ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libapr-1.0.dylib + ) + add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libaprutil-1.0.dylib ${LL_TEST_DESTINATION_DIR} + DEPENDS ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libaprutil-1.0.dylib + ) + add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libexception_handler.dylib ${LL_TEST_DESTINATION_DIR} + DEPENDS ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libexception_handler.dylib + ) + add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libexpat.1.5.2.dylib ${LL_TEST_DESTINATION_DIR} + DEPENDS ${CMAKE_SOURCE_DIR}/../build-darwin-i386/packages/lib/release/libexpat.1.5.2.dylib + ) + +endif (DARWIN) + # # Example Programs # |