diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt index bd59f57e492948c12ef39b88737a405f0514bdec..138a4cf0f50f431d2d7b9dc2ee571bdd3dc53ea6 100644 --- a/indra/integration_tests/llimage_libtest/CMakeLists.txt +++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt @@ -102,27 +102,27 @@ add_custom_command(TARGET llimage_libtest POST_BUILD DEPENDS ${BUILT_LLCOMMON} ) -if (DARWIN) - # Copy the required libraries to the package app - add_custom_command(TARGET llimage_libtest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libapr-1.0.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} - DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libapr-1.0.dylib - ) - add_custom_command(TARGET llimage_libtest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libaprutil-1.0.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} - DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libaprutil-1.0.dylib - ) - add_custom_command(TARGET llimage_libtest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} - DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib - ) - foreach(expat ${EXPAT_COPY}) - add_custom_command(TARGET llimage_libtest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} ${LLIMAGE_LIBTEST_DESTINATION_DIR} - DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} - ) - endforeach(expat) -endif (DARWIN) +# if (DARWIN) +# # Copy the required libraries to the package app +# add_custom_command(TARGET llimage_libtest POST_BUILD +# COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libapr-1.0.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} +# DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libapr-1.0.dylib +# ) +# add_custom_command(TARGET llimage_libtest POST_BUILD +# COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libaprutil-1.0.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} +# DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libaprutil-1.0.dylib +# ) +# add_custom_command(TARGET llimage_libtest POST_BUILD +# COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} +# DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib +# ) +# foreach(expat ${EXPAT_COPY}) +# add_custom_command(TARGET llimage_libtest POST_BUILD +# COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} ${LLIMAGE_LIBTEST_DESTINATION_DIR} +# DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} +# ) +# endforeach(expat) +# endif (DARWIN) if (WINDOWS) # Check indra/test_apps/llplugintest/CMakeLists.txt for an example of what to copy over for Windows and how diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 97557d9c268a673b84c1f16de7a0538cbd7b1dd5..287b0095198ea783ffc0fbaf168ffd0d7c7e7cb8 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -171,40 +171,40 @@ if (LL_TESTS AND LLCOREHTTP_TESTS) ) if (DARWIN) - # Path inside the app bundle where we'll need to copy libraries - set(LL_TEST_DESTINATION_DIR - ${CMAKE_BINARY_DIR}/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." - ) + # # Path inside the app bundle where we'll need to copy libraries + # set(LL_TEST_DESTINATION_DIR + # ${CMAKE_BINARY_DIR}/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. We used to use a sequence - # of '${CMAKE_COMMAND} -E copy' commands, but 'cmake -E copy' does only a - # single file at a time: it doesn't understand wildcards. 'cmake -E copy' is - # for portability. This operation is Darwin-specific. We can count on the - # 'cp' command. - set(copy_dylibs - libapr-1.0.dylib - libaprutil-1.0.dylib - ${EXPAT_COPY} - ) - - add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD - WORKING_DIRECTORY "${AUTOBUILD_INSTALL_DIR}/lib/release" - COMMAND cp -v - ${copy_dylibs} - ${LL_TEST_DESTINATION_DIR} - DEPENDS ${copy_dylibs} - ) + # # Copy the required libraries to the package app. We used to use a sequence + # # of '${CMAKE_COMMAND} -E copy' commands, but 'cmake -E copy' does only a + # # single file at a time: it doesn't understand wildcards. 'cmake -E copy' is + # # for portability. This operation is Darwin-specific. We can count on the + # # 'cp' command. + # set(copy_dylibs + # libapr-1.0.dylib + # libaprutil-1.0.dylib + # ${EXPAT_COPY} + # ) + + # add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD + # WORKING_DIRECTORY "${AUTOBUILD_INSTALL_DIR}/lib/release" + # COMMAND cp -v + # ${copy_dylibs} + # ${LL_TEST_DESTINATION_DIR} + # DEPENDS ${copy_dylibs} + # ) endif (DARWIN)