diff options
author | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
commit | 56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (patch) | |
tree | c1b61940e39d615201e18259bcab1762c5a8c655 /indra/cmake/DragDrop.cmake | |
parent | f684d897f532bcba87cda1f72bd19efac82f6cb6 (diff) | |
parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/cmake/DragDrop.cmake')
-rw-r--r-- | indra/cmake/DragDrop.cmake | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/indra/cmake/DragDrop.cmake b/indra/cmake/DragDrop.cmake index c0424396e5..b70aa6b6ee 100644 --- a/indra/cmake/DragDrop.cmake +++ b/indra/cmake/DragDrop.cmake @@ -1,23 +1,20 @@ # -*- cmake -*- -if (VIEWER) +set(OS_DRAG_DROP ON CACHE BOOL "Build the viewer with OS level drag and drop turned on or off") - set(OS_DRAG_DROP ON CACHE BOOL "Build the viewer with OS level drag and drop turned on or off") +if (OS_DRAG_DROP) - if (OS_DRAG_DROP) + if (WINDOWS) + add_definitions(-DLL_OS_DRAGDROP_ENABLED=1) + endif (WINDOWS) - if (WINDOWS) - add_definitions(-DLL_OS_DRAGDROP_ENABLED=1) - endif (WINDOWS) + if (DARWIN) + add_definitions(-DLL_OS_DRAGDROP_ENABLED=1) + endif (DARWIN) - if (DARWIN) - add_definitions(-DLL_OS_DRAGDROP_ENABLED=1) - endif (DARWIN) + if (LINUX) + add_definitions(-DLL_OS_DRAGDROP_ENABLED=0) + endif (LINUX) - if (LINUX) - add_definitions(-DLL_OS_DRAGDROP_ENABLED=0) - endif (LINUX) +endif (OS_DRAG_DROP) - endif (OS_DRAG_DROP) - -endif (VIEWER) |