From 6043e2791b59208aa0a167021c10df13bee9cc5d Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Thu, 18 Jan 2018 23:06:11 +0000 Subject: [PATCH] Add soversion to lib --- lib/CMakeLists.txt | 18 +++++++++++++----- lib/PlaYUVerOptions.h | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index ccd8c98..983ea38 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -30,7 +30,6 @@ IF( USE_OPENCV ) LIST( APPEND PlaYUVer_Lib_SRCS StreamHandlerOpenCV.cpp ) ENDIF() - set(PlaYUVer_Lib_HEADERS PlaYUVerDefs.h PlaYUVerPixel.h @@ -40,20 +39,29 @@ set(PlaYUVer_Lib_HEADERS PlaYUVerModuleIf.h ) - CONFIGURE_FILE( PlaYUVerConfig.cmake.in PlaYUVerConfig.cmake @ONLY) +INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS} ) + IF( USE_STATIC ) ADD_LIBRARY( PlaYUVerLib STATIC ${PlaYUVer_Lib_SRCS} ) ELSE() ADD_LIBRARY( PlaYUVerLib SHARED ${PlaYUVer_Lib_SRCS} ) ENDIF() -INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS} ) -TARGET_LINK_LIBRARIES( PlaYUVerLib ${FFMPEG_LIBRARIES} ${OpenCV_LIBRARIES} ) + +TARGET_LINK_LIBRARIES( PlaYUVerLib + ${FFMPEG_LIBRARIES} + ${OpenCV_LIBRARIES} +) + +SET_TARGET_PROPERTIES( PlaYUVerLib + PROPERTIES VERSION ${PLAYUVER_VERSION} + SOVERSION ${PLAYUVER_VERSION_MAJOR} +) IF( NOT USE_STATIC ) + INSTALL(TARGETS PlaYUVerLib DESTINATION ${CMAKE_INSTALL_LIBDIR} ) INSTALL(FILES ${PlaYUVer_Lib_HEADERS} DESTINATION include ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/PlaYUVerConfig.cmake DESTINATION share/playuver ) - INSTALL(TARGETS PlaYUVerLib DESTINATION ${CMAKE_INSTALL_LIBDIR} ) ENDIF() diff --git a/lib/PlaYUVerOptions.h b/lib/PlaYUVerOptions.h index c1fa82d..8de2857 100644 --- a/lib/PlaYUVerOptions.h +++ b/lib/PlaYUVerOptions.h @@ -131,7 +131,7 @@ public: // desc ); Bool checkListingOpts(); - //Void listModules(); + //Void listModules(); private: typedef std::map OptionMap;