diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-23 12:05:09 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-23 12:05:09 +0300 |
| commit | 6290930c98ace2d3b3d76d3be0a06df718a9a238 (patch) | |
| tree | 48584ccb08b80d120ec53f3d1df16df55cd9480b /indra/media_plugins/webkit/CMakeLists.txt | |
| parent | e02b51f125f876cfef10f504a121693b3612155a (diff) | |
| parent | 11ec720a063b73fc042e8b06338b9526835dbb6b (diff) | |
Merge with default branch
--HG--
branch : product-engine
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) |