diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 15:11:03 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 15:11:03 -0800 |
| commit | 1500e90eccf237fb50f901528c5dc9d747f6d2f0 (patch) | |
| tree | a9bdfc52e76fcbbebda2e6695a2410431074fc7a /indra/cmake | |
| parent | 8944bc36ed84fe7ef644e11d1114528520dab670 (diff) | |
Make sure mac build honors compile-time flag that en/disables OS drag and drop.
Also fixed the cmake file to properly set LL_OS_DRAGDROP_ENABLED.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/DragDrop.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/cmake/DragDrop.cmake b/indra/cmake/DragDrop.cmake index 739d011813..e56264f187 100644 --- a/indra/cmake/DragDrop.cmake +++ b/indra/cmake/DragDrop.cmake @@ -2,9 +2,7 @@ if (VIEWER)
- OPTION (OS_DRAG_DROP
- "Build the viewer with OS level drag and drop turned on or off"
- ON)
+ set(OS_DRAG_DROP ON CACHE BOOL "Build the viewer with OS level drag and drop turned on or off")
if (OS_DRAG_DROP)
@@ -13,7 +11,7 @@ if (VIEWER) endif (WINDOWS)
if (DARWIN)
- add_definitions(-DLL_OS_DRAGDROP_ENABLED=0)
+ add_definitions(-DLL_OS_DRAGDROP_ENABLED=1)
endif (DARWIN)
if (LINUX)
|