diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-05-29 20:02:02 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-05-29 20:02:02 +0000 |
| commit | d22e58bf97516718933354cf38ef7cb97a087ec5 (patch) | |
| tree | 9f6588d693739ca2fe2528dd66ee153f0326bd14 /src | |
| parent | d9da36ad707752d9861ddbd62be5a091c76751fb (diff) | |
| download | qmmp-d22e58bf97516718933354cf38ef7cb97a087ec5.tar.gz qmmp-d22e58bf97516718933354cf38ef7cb97a087ec5.tar.bz2 qmmp-d22e58bf97516718933354cf38ef7cb97a087ec5.zip | |
fixed cmake build progress (thanks to Ken Martin)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@393 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmmp/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index 5448fc546..cb8bc76f2 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -68,7 +68,7 @@ QT4_WRAP_CPP(libqmmp_MOC_SRCS ${libqmmp_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(qmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS}) -target_link_libraries(qmmp ${QT_LIBRARIES} ${CURL_LDFLAGS} ${CURL_CFLAGS}) -SET_TARGET_PROPERTIES(qmmp PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION}) -install(TARGETS qmmp LIBRARY DESTINATION ${LIB_DIR}) +ADD_LIBRARY(libqmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS}) +target_link_libraries(libqmmp ${QT_LIBRARIES} ${CURL_LDFLAGS} ${CURL_CFLAGS}) +SET_TARGET_PROPERTIES(libqmmp PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION} OUTPUT_NAME qmmp) +install(TARGETS libqmmp LIBRARY DESTINATION ${LIB_DIR}) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 9ec364004..e7047a5a0 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -3,7 +3,6 @@ project(ui) cmake_minimum_required(VERSION 2.4.0) if(COMMAND cmake_policy) - cmake_policy(SET CMP0002 OLD) cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0005 OLD) endif(COMMAND cmake_policy) @@ -31,8 +30,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) # libqmmp & libqmmpui include_directories(${CMAKE_CURRENT_BINARY_DIR}/../) -link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmp) -link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmpui) link_directories(${CMAKE_INSTALL_PREFIX}/lib) link_directories(${CMAKE_INSTALL_PREFIX}/lib64) @@ -173,7 +170,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_EXECUTABLE(qmmp ${ui_SRCS} ${ui_MOC_SRCS} ${ui_UIS_H} ${ui_RCC_SRCS}) -target_link_libraries(qmmp ${QT_LIBRARIES} -lqmmp -lqmmpui) +target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp qmmpui) install(TARGETS qmmp DESTINATION bin) install(FILES qmmp.desktop DESTINATION share/applications) install(FILES images/16x16/qmmp.png DESTINATION share/icons/hicolor/16x16/apps) |