aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/test_apps/llplugintest
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/test_apps/llplugintest
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-next.zip
meta-impy-next.tar.gz
meta-impy-next.tar.bz2
meta-impy-next.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to 'linden/indra/test_apps/llplugintest')
-rw-r--r--linden/indra/test_apps/llplugintest/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/test_apps/llplugintest/CMakeLists.txt b/linden/indra/test_apps/llplugintest/CMakeLists.txt
index a6cb740..91ba2db 100644
--- a/linden/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/linden/indra/test_apps/llplugintest/CMakeLists.txt
@@ -311,7 +311,7 @@ endif (DARWIN OR LINUX)
311if (DARWIN) 311if (DARWIN)
312 # path inside the app bundle where we'll need to copy plugins and other related files 312 # path inside the app bundle where we'll need to copy plugins and other related files
313 set(PLUGINS_DESTINATION_DIR 313 set(PLUGINS_DESTINATION_DIR
314 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llmediaplugintest.app/Contents/Resources 314 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llmediaplugintest.app/Contents/Resources
315 ) 315 )
316 316
317 # create the Contents/Resources directory 317 # create the Contents/Resources directory
@@ -326,7 +326,7 @@ if (DARWIN)
326 ) 326 )
327else (DARWIN) 327else (DARWIN)
328 set(PLUGINS_DESTINATION_DIR 328 set(PLUGINS_DESTINATION_DIR
329 ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ 329 ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/
330 ) 330 )
331endif (DARWIN) 331endif (DARWIN)
332 332