starred/archived-mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-12-26 11:17:44 +01:00
Code Issues Projects Packages Wiki Activity Actions

[build]: correct install directory and generate pkgconfig for linux

Browse source 
Change-Id: Id4f6b2278ee0fe50ffc9806fffc5b01267f723db
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
This commit is contained in:
Jacob Chen 2017-12-15 16:55:17 +08:00
parent 0b71be06ee
commit 81759e832a
5 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
CMakeLists.txt
View file

@ -358,12 +358,9 @@ configure_file(
# ----------------------------------------------------------------------------
# Build options
# ----------------------------------------------------------------------------
set(CMAKE_INSTALL_PREFIX "")
set(LIB_INSTALL_DIR "${CMAKE_SOURCE_DIR}/out/lib/${SYSPROC}" CACHE STRING "Install location of libraries")
set(BIN_INSTALL_DIR "${CMAKE_SOURCE_DIR}/out/bin" CACHE STRING "Install location of executables")
set(TEST_INSTALL_DIR "${CMAKE_BINARY_DIR}/test" CACHE STRING "Install location of unit test")
set(INC_INSTALL_DIR "${CMAKE_SOURCE_DIR}/out/inc" CACHE STRING "Install location of headers")
find_package(PkgConfig)
INCLUDE(GNUInstallDirs)
pkg_search_module(PTHREAD pthread)
# ----------------------------------------------------------------------------
# Set Warning as Error
@ -491,6 +488,18 @@ add_subdirectory(test)
# install headers
# ----------------------------------------------------------------------------
install(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/
DESTINATION "${INC_INSTALL_DIR}"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/rockchip"
FILES_MATCHING PATTERN "*.h"
)
# ----------------------------------------------------------------------------
# pkgconfig
# ----------------------------------------------------------------------------
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/pkgconfig/rockchip_mpp.pc.cmake"
"${CMAKE_BINARY_DIR}/rockchip_mpp.pc" @ONLY)
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/pkgconfig/rockchip_vpu.pc.cmake"
"${CMAKE_BINARY_DIR}/rockchip_vpu.pc" @ONLY)
install(FILES "${CMAKE_BINARY_DIR}/rockchip_mpp.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
install(FILES "${CMAKE_BINARY_DIR}/rockchip_vpu.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")

4
mpp/CMakeLists.txt
View file

@ -68,6 +68,6 @@ add_subdirectory(legacy)
add_subdirectory(test)
install(TARGETS ${MPP_STATIC} ${MPP_SHARED}
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)

5
mpp/legacy/CMakeLists.txt
View file

@ -42,3 +42,8 @@ if(RKPLATFORM)
else()
target_link_libraries(${VPU_SHARED} ${MPP_SHARED})
endif()
install(TARGETS ${VPU_STATIC} ${VPU_SHARED}
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)

2
mpp/test/CMakeLists.txt
View file

@ -15,7 +15,7 @@ macro(add_mpp_test module)
add_executable(${test_name} ${test_name}.c)
target_link_libraries(${test_name} ${MPP_SHARED})
set_target_properties(${test_name} PROPERTIES FOLDER "mpp/test")
install(TARGETS ${test_name} RUNTIME DESTINATION ${TEST_INSTALL_DIR})
install(TARGETS ${test_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
#add_test(NAME ${test_name} COMMAND ${test_name})
endif()
endmacro()

4
test/CMakeLists.txt
View file

@ -15,7 +15,7 @@ macro(add_mpp_test module)
add_executable(${test_name} ${test_name}.c mpp_event_trigger.c mpp_parse_cfg.c)
target_link_libraries(${test_name} ${MPP_SHARED} utils)
set_target_properties(${test_name} PROPERTIES FOLDER "test")
#install(TARGETS ${test_name} RUNTIME DESTINATION ${TEST_INSTALL_DIR})
install(TARGETS ${test_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
#add_test(NAME ${test_name} COMMAND ${test_name})
endif()
endmacro()
@ -47,7 +47,7 @@ macro(add_legacy_test module)
add_executable(${test_name} ${test_name}.c)
target_link_libraries(${test_name} ${VPU_SHARED} utils)
set_target_properties(${test_name} PROPERTIES FOLDER "test")
#install(TARGETS ${test_name} RUNTIME DESTINATION ${TEST_INSTALL_DIR})
install(TARGETS ${test_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
#add_test(NAME ${test_name} COMMAND ${test_name})
endif()
endmacro()