diff options
| author | stalkerg <stalkerg@90c681e8-e032-0410-971d-27865f9a5e38> | 2007-08-13 20:47:09 +0000 |
|---|---|---|
| committer | stalkerg <stalkerg@90c681e8-e032-0410-971d-27865f9a5e38> | 2007-08-13 20:47:09 +0000 |
| commit | d9b85f44651fd336442d720e56645646e86d6d30 (patch) | |
| tree | ef02b58b7442464604da1a46c723a74cddf7e4fb | |
| parent | 09955287c7d444e00b9aa0948abee58560b3d1a6 (diff) | |
| download | qmmp-d9b85f44651fd336442d720e56645646e86d6d30.tar.gz qmmp-d9b85f44651fd336442d720e56645646e86d6d30.tar.bz2 qmmp-d9b85f44651fd336442d720e56645646e86d6d30.zip | |
Fix bug in cmake scripts.
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@86 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | lib/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | lib/qmmp/Input/vorbis/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 3b2fc8df9..134101ee4 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -24,6 +24,8 @@ SET(libqmmp_SRCS equ/iir_cfs.c equ/iir_fpu.c soundcore.cpp + streamreader.cpp + downloader.cpp ) SET(libqmmp_MOC_HDRS @@ -40,6 +42,8 @@ SET(libqmmp_MOC_HDRS equ/iir.h decoderfactory.h soundcore.h + streamreader.h + downloader.h ) QT4_WRAP_CPP(libqmmp_MOC_SRCS ${libqmmp_MOC_HDRS}) @@ -48,6 +52,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(qmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS}) -target_link_libraries(qmmp ${QT_LIBRARIES}) +target_link_libraries(qmmp ${QT_LIBRARIES} curl) install(TARGETS qmmp LIBRARY DESTINATION lib) diff --git a/lib/qmmp/Input/vorbis/CMakeLists.txt b/lib/qmmp/Input/vorbis/CMakeLists.txt index 48f29e26f..4eaab898a 100644 --- a/lib/qmmp/Input/vorbis/CMakeLists.txt +++ b/lib/qmmp/Input/vorbis/CMakeLists.txt @@ -47,11 +47,11 @@ IF(NOT VORBISFILE_LINK_FLAGS) SET(VORBISFILE_LINK_FLAGS -lvorbisfile) ENDIF(NOT VORBISFILE_LINK_FLAGS) -IF(NOT ${TAGLIB_LINK_FLAGS}) +IF(NOT TAGLIB_LINK_FLAGS) SET(TAGLIB_LINK_FLAGS -ltag) SET(TAGLIB_INCLUDE_DIR /usr/include/taglib) SET(TAGLIB_CFLAGS -I/usr/include/taglib) -ENDIF(NOT ${TAGLIB_LINK_FLAGS}) +ENDIF(NOT TAGLIB_LINK_FLAGS) include_directories(${VORBIS_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR}) link_directories(${VORBIS_LINK_DIR} ${TAGLIB_LINK_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a7dd13e8a..a7e642610 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,6 +73,8 @@ SET(libsrc_SRCS aboutdialog.cpp timeindicator.cpp keyboardmanager.cpp + addurldialog.cpp + filedialog.cpp ) SET(libsrc_MOC_HDRS @@ -122,6 +124,8 @@ SET(libsrc_MOC_HDRS aboutdialog.h timeindicator.h keyboardmanager.h + addurldialog.h + filedialog.h ) SET(libsrc_RCCS images/images.qrc stuff.qrc translations/qmmp_locales.qrc) @@ -139,6 +143,7 @@ SET(libsrc_UIS preseteditor.ui jumptotrackdialog.ui aboutdialog.ui + addurldialog.ui ) SET(src_FILES |