diff options
| -rwxr-xr-x | bin/qmmp_launcher (renamed from bin/qmmp) | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/src.pro | 8 |
3 files changed, 7 insertions, 14 deletions
diff --git a/bin/qmmp b/bin/qmmp_launcher index ae13c2b9f..dbea73895 100755 --- a/bin/qmmp +++ b/bin/qmmp_launcher @@ -5,4 +5,4 @@ printf '\nSetting LD_LIBRARY_PATH to '$LD_LIBRARY_PATH export LD_LIBRARY_PATH printf '\n'$LD_LIBRARY_PATH printf '\n' -exec $MYDIR/qmmp.real "$@" +exec $MYDIR/qmmp "$@" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 47d73130d..3aa9cdcc2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -148,18 +148,13 @@ SET(libsrc_UIS addurldialog.ui ) -SET(src_FILES - ../bin/qmmp -) QT4_WRAP_UI(libsrc_UIS_H ${libsrc_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_EXECUTABLE(qmmp.real ${libsrc_SRCS} ${libsrc_MOC_SRCS} ${libsrc_UIS_H} +ADD_EXECUTABLE(qmmp ${libsrc_SRCS} ${libsrc_MOC_SRCS} ${libsrc_UIS_H} ${libsrc_RCC_SRCS}) -target_link_libraries(qmmp.real ${QT_LIBRARIES} -lqmmp) -install(TARGETS qmmp.real DESTINATION bin PERMISSIONS WORLD_EXECUTE OWNER_READ OWNER_WRITE) -install(FILES ${src_FILES} DESTINATION bin PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ -WORLD_EXECUTE WORLD_READ) +target_link_libraries(qmmp ${QT_LIBRARIES} -lqmmp) +install(TARGETS qmmp DESTINATION bin PERMISSIONS WORLD_EXECUTE OWNER_READ OWNER_WRITE) diff --git a/src/src.pro b/src/src.pro index 5b32d9aad..a7d321a73 100644 --- a/src/src.pro +++ b/src/src.pro @@ -122,7 +122,7 @@ contains(CONFIG,XSPF_PLUGIN){ } QT += network -TARGET = ../bin/qmmp.real +TARGET = ../bin/qmmp CONFIG += thread release \ warn_on QMAKE_LIBDIR += ../lib @@ -135,11 +135,9 @@ RESOURCES = images/images.qrc \ #TRANSLATIONS = translations/qmmp_ru.ts \ # translations/qmmp_tr.ts \ # translations/qmmp_zh_CN.ts -TEMPLATE = app -script.files += ../bin/qmmp -script.path = /bin +TEMPLATE = app target.path = /bin -INSTALLS += target script +INSTALLS += target HEADERS += addurldialog.h \ skinreader.h |