diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-22 11:11:58 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-22 11:11:58 +0100 |
| commit | 81597463beb01fccd3e4bf9d7dea6bcdcd095115 (patch) | |
| tree | 5e461793c9d68f835265311a3e251afdd968487e /indra/media_plugins/webkit/CMakeLists.txt | |
| parent | b04ca1b069108292d79f47b5ce855028bb5394e0 (diff) | |
| parent | 7295e1ee034b3163b2f1c9f4aa11695beb7db8b0 (diff) | |
hairy merge of glib restoration
Diffstat (limited to 'indra/media_plugins/webkit/CMakeLists.txt')
| -rw-r--r-- | indra/media_plugins/webkit/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 1a559ed39c..d576638dd7 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -50,8 +50,10 @@ set(media_plugin_webkit_LINK_LIBRARIES ) # Select which VolumeCatcher implementation to use -if (LINUX AND PULSEAUDIO) - list(APPEND media_plugin_webkit_SOURCE_FILES linux_volume_catcher.cpp) +if (LINUX) + if (PULSEAUDIO) + list(APPEND media_plugin_webkit_SOURCE_FILES linux_volume_catcher.cpp) + endif (PULSEAUDIO) list(APPEND media_plugin_webkit_LINK_LIBRARIES ${UI_LIBRARIES} # for glib/GTK ) @@ -65,10 +67,10 @@ elseif (DARWIN) ) elseif (WINDOWS) list(APPEND media_plugin_webkit_SOURCE_FILES windows_volume_catcher.cpp) -else (LINUX AND PULSEAUDIO) +else (LINUX) # All other platforms use the dummy volume catcher for now. list(APPEND media_plugin_webkit_SOURCE_FILES dummy_volume_catcher.cpp) -endif (LINUX AND PULSEAUDIO) +endif (LINUX) set_source_files_properties(${media_plugin_webkit_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) |