diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-08-31 16:37:40 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-08-31 16:37:40 -0500 |
| commit | e68f9e566b5aeb5341f5adea0b8a6ccde86ee93d (patch) | |
| tree | 6454bf6b303d03f89e567a6ea9cfee7c85aaa1ac /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | 3cabca8df62ae8ee815dd7d885f14f5a7d0ea98d (diff) | |
| parent | 771195865c4fb336f573025e9a7a22313bfb6cb8 (diff) | |
merge
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 2dd296bf12..9900a8fb45 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -38,6 +38,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables @@ -48,6 +50,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) if(USE_GOOGLE_PERFTOOLS) @@ -286,7 +290,7 @@ copy_if_different( ${vivox_src_dir} "${SHARED_LIB_STAGING_DIR_DEBUG}" out_targets - ${vivox_files} + ${vivox_files} ) set(third_party_targets ${third_party_targets} ${out_targets}) @@ -391,9 +395,7 @@ if(NOT EXISTS ${internal_llkdu_path}) endif (NOT EXISTS ${internal_llkdu_path}) -if(NOT STANDALONE) - add_custom_target( - stage_third_party_libs ALL - DEPENDS ${third_party_targets} - ) -endif(NOT STANDALONE) +add_custom_target(stage_third_party_libs ALL + DEPENDS + ${third_party_targets} + ) |