diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-11-19 09:58:03 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-11-19 09:58:03 +0100 |
| commit | 879e2ea7d15510ec5f94d6d7a005b157b115f69f (patch) | |
| tree | 73aedd0bffe7ab39387229a9417aa50cecbbf0aa /src/3rdparty/phonon/includes/CMakeLists.txt | |
| parent | 8fc2eec5b3282665f76f1e0313a03608bf4e7bc1 (diff) | |
| parent | 80cd617b05ad3e647c87dc063d40cde0617344ca (diff) | |
Merge remote branch 'origin/4.6' into lighthouse
Conflicts:
configure
src/plugins/graphicssystems/graphicssystems.pro
Diffstat (limited to 'src/3rdparty/phonon/includes/CMakeLists.txt')
| -rw-r--r-- | src/3rdparty/phonon/includes/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/includes/CMakeLists.txt b/src/3rdparty/phonon/includes/CMakeLists.txt index 349acd87a3..dff86c31f4 100644 --- a/src/3rdparty/phonon/includes/CMakeLists.txt +++ b/src/3rdparty/phonon/includes/CMakeLists.txt @@ -35,7 +35,7 @@ install( FILES Phonon/VolumeFaderEffect Phonon/VolumeFaderInterface Phonon/VolumeSlider -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon) +DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel) install(FILES Phonon/Experimental/AbstractVideoDataOutput @@ -46,4 +46,4 @@ install(FILES Phonon/Experimental/VideoFrame Phonon/Experimental/VideoFrame2 Phonon/Experimental/Visualization -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon/Experimental) +DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon/Experimental COMPONENT Devel) |