diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-26 12:28:04 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-26 12:28:04 +0100 |
| commit | a1d010293d5a72fe31c927cd8fcc5e306cd964b0 (patch) | |
| tree | 86055fe95108185a73c42966063622c3b3a37a19 /indra/newview/CMakeLists.txt | |
| parent | 1d89a80ba7293309fd4fbdd03b802c5c2998aac7 (diff) | |
| parent | 3862dcd51b97b6b5ed3ab6ec2cb8b286773edb6e (diff) | |
re-merge viewer-public. has a rough edge or two, but this is closer to the snowglobe2.1 and viewer2.2 code, and beats people re-applying their viewer-public changes piecemeal while waiting for this to land.
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 653bc13260..630902c48f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1390,10 +1390,6 @@ add_executable(${VIEWER_BINARY_NAME} ${viewer_SOURCE_FILES} ) -if (LLKDU_LIBRARY) - add_dependencies(${VIEWER_BINARY_NAME} ${LLKDU_LIBRARY}) -endif (LLKDU_LIBRARY) - # add package files file(GLOB EVENT_HOST_SCRIPT_GLOB_LIST ${CMAKE_CURRENT_SOURCE_DIR}/../viewer_components/*.py) @@ -1551,11 +1547,6 @@ if (WINDOWS) add_dependencies(${VIEWER_BINARY_NAME} stage_third_party_libs llcommon copy_w_viewer_manifest) - if(LLKDU_LIBRARY) - # kdu may not exist! - add_dependencies(copy_w_viewer_manifest llkdu) - endif(LLKDU_LIBRARY) - if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts) add_dependencies(${VIEWER_BINARY_NAME} copy_win_scripts) endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts) |