diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-10-15 08:37:10 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-10-15 08:37:10 +0000 |
| commit | f3a81cc15b9cbd3787869e2a4a32fcd82c90c8c4 (patch) | |
| tree | ea8ee22a814847e60cec5fa1bba38fe8471dc67e /src/plugins/Output | |
| parent | 6fe2f98c9a5a2e581a4bbd613b1c80ffc29ad7d3 (diff) | |
| download | qmmp-f3a81cc15b9cbd3787869e2a4a32fcd82c90c8c4.tar.gz qmmp-f3a81cc15b9cbd3787869e2a4a32fcd82c90c8c4.tar.bz2 qmmp-f3a81cc15b9cbd3787869e2a4a32fcd82c90c8c4.zip | |
fixed incorrect cflags usage
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2401 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Output')
| -rw-r--r-- | src/plugins/Output/alsa/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/Output/jack/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/Output/pulseaudio/CMakeLists.txt | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt index 327151e69..7a5bd68c8 100644 --- a/src/plugins/Output/alsa/CMakeLists.txt +++ b/src/plugins/Output/alsa/CMakeLists.txt @@ -29,6 +29,7 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) pkg_search_module(ALSA alsa) include_directories(${ALSA_INCLUDE_DIRS}) link_directories(${ALSA_LIBRARY_DIRS}) +ADD_DEFINITIONS(${ALSA_CFLAGS}) SET(libalsa_SRCS outputalsa.cpp @@ -64,7 +65,7 @@ IF(ALSA_FOUND) ADD_LIBRARY(alsa MODULE ${libalsa_SRCS} ${libalsa_MOC_SRCS} ${libalsa_UIS_H} ${libalsa_RCC_SRCS}) add_dependencies(alsa qmmp) -target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp ${ALSA_LDFLAGS} ${ALSA_CFLAGS}) +target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp ${ALSA_LDFLAGS}) install(TARGETS alsa DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(ALSA_FOUND) diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt index 845d2e871..94955b0dd 100644 --- a/src/plugins/Output/jack/CMakeLists.txt +++ b/src/plugins/Output/jack/CMakeLists.txt @@ -30,6 +30,7 @@ pkg_check_modules(JACK jack samplerate) include_directories(${JACK_INCLUDE_DIRS}) link_directories(${JACK_LIBRARY_DIRS}) +ADD_DEFINITIONS(${JACK_CFLAGS}) IF(JACK_FOUND) @@ -81,7 +82,7 @@ set_target_properties(jack PROPERTIES COMPILE_FLAGS -pthread LINK_FLAGS -pthread ) -target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LDFLAGS} ${JACK_CFLAGS}) +target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LDFLAGS}) install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(JACK_FOUND) diff --git a/src/plugins/Output/pulseaudio/CMakeLists.txt b/src/plugins/Output/pulseaudio/CMakeLists.txt index c1501e08d..58ee17614 100644 --- a/src/plugins/Output/pulseaudio/CMakeLists.txt +++ b/src/plugins/Output/pulseaudio/CMakeLists.txt @@ -30,6 +30,7 @@ pkg_check_modules(PULSE libpulse-simple>=0.9.15) include_directories(${PULSE_INCLUDE_DIRS}) link_directories(${PULSE_LIBRARY_DIRS}) +ADD_DEFINITIONS(${PULSE_CFLAGS}) SET(libpulseaudio_SRCS outputpulseaudio.cpp @@ -56,7 +57,7 @@ IF(PULSE_FOUND) ADD_LIBRARY(pulseaudio MODULE ${libpulseaudio_SRCS} ${libpulseaudio_MOC_SRCS} ${libpulseaudio_UIS_H} ${libpulseaudio_RCC_SRCS}) add_dependencies(pulseaudio qmmp) -target_link_libraries(pulseaudio ${QT_LIBRARIES} -lqmmp ${PULSE_LDFLAGS} ${PULSE_CFLAGS}) +target_link_libraries(pulseaudio ${QT_LIBRARIES} -lqmmp ${PULSE_LDFLAGS}) install(TARGETS pulseaudio DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(PULSE_FOUND) |