diff --git a/CMakeLists.txt b/CMakeLists.txt index cd64f81..07a2415 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ cmake_minimum_required( VERSION 2.8.9 ) SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) INCLUDE( cmake/ModulesFct.cmake ) INCLUDE(FeatureSummary) +INCLUDE(GNUInstallDirs) ###################################################################################### # Project Definition @@ -19,9 +20,9 @@ set( PROJECT_NAME "playuver" CACHE INTERNAL "" FORCE ) PROJECT( ${PROJECT_NAME} ) SET( PLAYUVER_VERSION_MAJOR "0" ) -SET( PLAYUVER_VERSION_MINOR "13" ) +SET( PLAYUVER_VERSION_MINOR "14" ) SET( PLAYUVER_VERSION_PATCH "0" ) -set( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}" CACHE INTERNAL "" FORCE ) +SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}" CACHE INTERNAL "" FORCE ) ###################################################################################### # Variables diff --git a/app/PlaYUVerApp.cpp b/app/PlaYUVerApp.cpp index 708a6b4..e2a18fb 100644 --- a/app/PlaYUVerApp.cpp +++ b/app/PlaYUVerApp.cpp @@ -196,8 +196,8 @@ Void PlaYUVerApp::loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo ) m_pcWindowHandle->setActiveSubWindow( videoSubWindow ); return; } - videoSubWindow = - new VideoSubWindow( VideoSubWindow::VIDEO_STREAM_SUBWINDOW ); // createSubWindow(); + videoSubWindow = + new VideoSubWindow( VideoSubWindow::VIDEO_STREAM_SUBWINDOW ); // createSubWindow(); SubWindowAbstract* subWindow = videoSubWindow; if( !pStreamInfo ) { @@ -872,8 +872,8 @@ Void PlaYUVerApp::updateRecentFileActions() m_arrayRecentFilesActions.at( actionIdx )->setText( QFileInfo( text ).fileName() ); m_arrayRecentFilesActions.at( actionIdx )->setToolTip( "Open File " + text ); m_arrayRecentFilesActions.at( actionIdx )->setStatusTip( "Open File " + text ); - m_arrayRecentFilesActions.at( actionIdx ) - ->setData( QVariant::fromValue( m_aRecentFileStreamInfo.at( actionIdx ) ) ); + m_arrayRecentFilesActions.at( actionIdx ) + ->setData( QVariant::fromValue( m_aRecentFileStreamInfo.at( actionIdx ) ) ); m_arrayRecentFilesActions.at( actionIdx )->setVisible( true ); actionIdx++; } diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 32af0ea..613297a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -54,5 +54,5 @@ TARGET_LINK_LIBRARIES( PlaYUVerLib ${FFMPEG_LIBRARIES} ${OpenCV_LIBRARIES} ) IF( NOT USE_STATIC ) INSTALL(FILES ${PlaYUVer_Lib_HEADERS} DESTINATION include ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/PlaYUVerConfig.cmake DESTINATION share/playuver ) - INSTALL(TARGETS PlaYUVerLib DESTINATION lib ) + INSTALL(TARGETS PlaYUVerLib DESTINATION ${CMAKE_INSTALL_LIBDIR} ) ENDIF()