starred/mpp-nyanmisaka
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2026-01-24 04:40:39 +01:00
Code Issues Projects Packages Wiki Activity Actions

[cmake]: correct the cmake file

Browse source 
Change-Id: I0528c844557a5f431ad2db8e67c742b57094c22c
Signed-off-by: Randy Li <randy.li@rock-chips.com>
Signed-off-by: hertz.wang <wangh@rock-chips.com>
This commit is contained in:
Randy Li 2018-01-10 18:20:52 +08:00 • committed by Herman Chen
parent 347aeedbe8
commit b99bb30c0d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -396,12 +396,12 @@ endif(MSVC)
# On window import win32 pthread library
# ----------------------------------------------------------------------------
if(MSVC)
set(WIN32_PTHREAD_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/osal/windows/pthread/inc")
set(WIN32_PTHREAD_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/osal/windows/pthread/inc")
include_directories(${WIN32_PTHREAD_INCLUDE_DIRS})
add_library(pthread SHARED IMPORTED)
message(STATUS "platform X86 ${X86} X64 ${X64}")
set(WIN32_PTHREAD_LIB_DIRS "${CMAKE_SOURCE_DIR}/osal/windows/pthread/lib")
set(WIN32_PTHREAD_DLL_DIRS "${CMAKE_SOURCE_DIR}/osal/windows/pthread/dll")
set(WIN32_PTHREAD_LIB_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/osal/windows/pthread/lib")
set(WIN32_PTHREAD_DLL_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/osal/windows/pthread/dll")
if(X64)
set(WIN32_ARCH "x64")
else()
@ -476,7 +476,7 @@ add_subdirectory(test)
# ----------------------------------------------------------------------------
# install headers
# ----------------------------------------------------------------------------
install(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/rockchip"
FILES_MATCHING PATTERN "*.h"
)
@ -484,9 +484,9 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/
# ----------------------------------------------------------------------------
# pkgconfig
# ----------------------------------------------------------------------------
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/pkgconfig/rockchip_mpp.pc.cmake"
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/rockchip_mpp.pc.cmake"
"${CMAKE_BINARY_DIR}/rockchip_mpp.pc" @ONLY)
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/pkgconfig/rockchip_vpu.pc.cmake"
CONFIGURE_FILE("${CMAKE_CURRENT_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/")