Commit 4e57416b by baiyfcu

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

parent e2908e97
...@@ -5,19 +5,20 @@ file(GLOB api_src_list include/*.h source/*.cpp source/*.h source/*.c) ...@@ -5,19 +5,20 @@ 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)
return()
endif ()
if (ENABLE_API_STATIC_LIB)
add_definitions(-DMediaKitApi_STATIC)
add_library(mk_api STATIC ${api_src_list})
else () else ()
if (ENABLE_API_STATIC_LIB) add_library(mk_api SHARED ${api_src_list})
add_library(mk_api STATIC ${api_src_list}) endif ()
else ()
add_library(mk_api SHARED ${api_src_list})
endif ()
if (CMAKE_SYSTEM_NAME MATCHES "Linux") if (CMAKE_SYSTEM_NAME MATCHES "Linux")
target_link_libraries(mk_api -Wl,--start-group jsoncpp ${LINK_LIB_LIST} -Wl,--end-group) target_link_libraries(mk_api -Wl,--start-group jsoncpp ${LINK_LIB_LIST} -Wl,--end-group)
else () else ()
target_link_libraries(mk_api jsoncpp ${LINK_LIB_LIST}) target_link_libraries(mk_api jsoncpp ${LINK_LIB_LIST})
endif ()
add_subdirectory(tests)
endif () endif ()
add_definitions(-DGENERATE_EXPORT) add_definitions(-DGENERATE_EXPORT)
...@@ -29,8 +30,8 @@ generate_export_header(mk_api ...@@ -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)
install(FILES ${api_header_list} DESTINATION ${INSTALL_PATH_INCLUDE}) file(GLOB api_header_list include/*.h ${CMAKE_BINARY_DIR}/*.h)
install(TARGETS mk_api ARCHIVE DESTINATION ${INSTALL_PATH_LIB} LIBRARY DESTINATION ${INSTALL_PATH_LIB}) install(FILES ${api_header_list} DESTINATION ${INSTALL_PATH_INCLUDE})
endif () install(TARGETS mk_api ARCHIVE DESTINATION ${INSTALL_PATH_LIB} LIBRARY DESTINATION ${INSTALL_PATH_LIB})
\ No newline at end of file \ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论