amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 20:27:34 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复cmake generate export 和 test工程先后变编译错误问题

Browse Source
This commit is contained in:
baiyfcu 2022-05-27 17:03:49 +08:00
parent e2908e9775
commit 4e57416be9
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/CMakeLists.txt
View File

@ -5,8 +5,11 @@ file(GLOB api_src_list include/*.h source/*.cpp source/*.h source/*.c)
if (IOS) if (IOS)
add_library(mk_api STATIC ${api_src_list}) add_library(mk_api STATIC ${api_src_list})
target_link_libraries(mk_api ${LINK_LIB_LIST} jsoncpp) target_link_libraries(mk_api ${LINK_LIB_LIST} jsoncpp)
else () return()
endif ()
if (ENABLE_API_STATIC_LIB) if (ENABLE_API_STATIC_LIB)
add_definitions(-DMediaKitApi_STATIC)
add_library(mk_api STATIC ${api_src_list}) add_library(mk_api STATIC ${api_src_list})
else () else ()
add_library(mk_api SHARED ${api_src_list}) add_library(mk_api SHARED ${api_src_list})
@ -17,8 +20,6 @@ else ()
else () else ()
target_link_libraries(mk_api jsoncpp ${LINK_LIB_LIST}) target_link_libraries(mk_api jsoncpp ${LINK_LIB_LIST})
endif () endif ()
add_subdirectory(tests)
endif ()
add_definitions(-DGENERATE_EXPORT) add_definitions(-DGENERATE_EXPORT)
include_directories(${CMAKE_BINARY_DIR}) include_directories(${CMAKE_BINARY_DIR})
@ -29,8 +30,8 @@ generate_export_header(mk_api
EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/mk_export.h" EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/mk_export.h"
) )
if (NOT IOS) add_subdirectory(tests)
file(GLOB api_header_list include/*.h ${CMAKE_BINARY_DIR}/*.h) file(GLOB api_header_list include/*.h ${CMAKE_BINARY_DIR}/*.h)
install(FILES ${api_header_list} DESTINATION ${INSTALL_PATH_INCLUDE}) install(FILES ${api_header_list} DESTINATION ${INSTALL_PATH_INCLUDE})
install(TARGETS mk_api ARCHIVE DESTINATION ${INSTALL_PATH_LIB} LIBRARY DESTINATION ${INSTALL_PATH_LIB}) install(TARGETS mk_api ARCHIVE DESTINATION ${INSTALL_PATH_LIB} LIBRARY DESTINATION ${INSTALL_PATH_LIB})
endif ()