From 607822b0f5de9f0f539d59de2f91303939c7cee0 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 17 Nov 2015 01:12:43 +0000 Subject: [PATCH 1/2] Add include dir into lib --- lib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 18eccd8..990da10 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -2,7 +2,7 @@ ### CMakeLists for playuver lib component ### -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ ) +INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ ) set(plaYUver_Lib_SRCS # Frame From 07310ab0f16139db4821c5532b22b5f21000ccd9 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 17 Nov 2015 16:29:28 +0000 Subject: [PATCH 2/2] Add option to control static and dynamic libs --- CMakeLists.txt | 3 +++ lib/CMakeLists.txt | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 607a73d..9a1ff00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,7 @@ OPTION( PLAYUVER_BUILD_EXEMPLES "Build Examples" OFF ) OPTION( USE_SSE "Build with SSE support" OFF ) OPTION( USE_FERVOR "Add Fervor support" OFF ) OPTION( USE_WERROR "Warnings as errors" OFF ) +OPTION( USE_STATIC "Use static libs" ON ) OPTION( USE_QT4 "Build with Qt4" OFF ) OPTION( USE_QTDBUS "Build with Qt4" OFF ) OPTION( USE_DYNLOAD "Use dynamic load of modules" ON ) @@ -103,6 +104,7 @@ ADD_FEATURE_INFO(WErrors USE_WERROR "Warnings as errors" ) IF( WIN32 ) + SET( USE_STATIC OFF ) INCLUDE( cmake/Win32.cmake ) ENDIF() @@ -151,6 +153,7 @@ MESSAGE("") MESSAGE( STATUS "${PROJECT_NAME} INFORMATION" ) MESSAGE( STATUS "Version: " "${PLAYUVER_VERSION_STRING}" ) MESSAGE( STATUS "Configuration:" ) +MESSAGE( STATUS " Static libs: " "${USE_STATIC}" ) MESSAGE( STATUS " Build type: " "${CMAKE_BUILD_TYPE}" ) MESSAGE( STATUS " Build flags: " "${CMAKE_CXX_FLAGS}" ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 990da10..ed0ba4a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -47,7 +47,7 @@ set(plaYUver_Lib_HEADERS CONFIGURE_FILE( PlaYUVerConfig.cmake.in PlaYUVerConfig.cmake @ONLY) -IF( WIN32 ) +IF( USE_STATIC ) ADD_LIBRARY( PlaYUVerLib STATIC ${plaYUver_Lib_SRCS} ) ELSE() ADD_LIBRARY( PlaYUVerLib SHARED ${plaYUver_Lib_SRCS} ) @@ -56,7 +56,8 @@ ENDIF() 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}/PlaYUVerConfig.cmake DESTINATION share/PlaYUVer ) -# INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libPlaYUVerLib${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib ) -INSTALL(TARGETS PlaYUVerLib DESTINATION lib ) +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 ) +ENDIF()