From 6b4771bf83909861de10e46a7819d0ea9efcf667 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Mon, 17 Nov 2014 21:13:45 +0000 Subject: [PATCH] Fix cmake code to handle mime types --- app/CMakeLists.txt | 5 ++++- app/resources/playuver.xml | 25 +++++++++++++++++++++++++ app/resources/x-raw.xml | 7 ------- lib/CMakeLists.txt | 3 ++- 4 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 app/resources/playuver.xml delete mode 100644 app/resources/x-raw.xml diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 5677b4f..c0eca24 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -116,4 +116,7 @@ ENDIF() INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin ) INSTALL(FILES resources/playuver.desktop DESTINATION share/applications ) INSTALL(FILES resources/playuver.png DESTINATION share/icons ) -INSTALL(FILES resources/x-raw.xml DESTINATION share/mime/video ) \ No newline at end of file +INSTALL(FILES resources/playuver.xml DESTINATION share/mime/packages ) + + + diff --git a/app/resources/playuver.xml b/app/resources/playuver.xml new file mode 100644 index 0000000..7a718ec --- /dev/null +++ b/app/resources/playuver.xml @@ -0,0 +1,25 @@ + + + + + + + + Raw YUV file + + + + + + diff --git a/app/resources/x-raw.xml b/app/resources/x-raw.xml deleted file mode 100644 index 21e6d0f..0000000 --- a/app/resources/x-raw.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - Raw YUV file - - - - diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 13af4ae..4dd6b78 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -40,4 +40,5 @@ INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS} ) TARGET_LINK_LIBRARIES( PlaYUVerLib ${FFMPEG_LIBRARIES} ${OpenCV_LIBRARIES} ) INSTALL(FILES ${plaYUver_Lib_HEADERS} DESTINATION include ) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libPlaYUVerLib${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib ) +# INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libPlaYUVerLib${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib ) +INSTALL(TARGETS PlaYUVerLib DESTINATION lib )