cmhi
/
ztp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 1. 删除库编译选项。2. 单元测试直接编译源码 

SOL：
修改人：huangxin
检视人：huangxin
This commit is contained in:
huangxin 2019-12-16 17:51:37 +08:00
parent 7f4193e697
commit ca2377b2c3
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -25,6 +25,6 @@ LINK_LIBRARIES(-lpthread -lcjson -lconfig -lcurl)
ADD_EXECUTABLE(ztp_client ${ZTP_SRC} ztp_main.c) ADD_EXECUTABLE(ztp_client ${ZTP_SRC} ztp_main.c)
ADD_LIBRARY(ztp SHARED ${ZTP_SRC}) #ADD_LIBRARY(ztp SHARED ${ZTP_SRC})
INCLUDE_DIRECTORIES("./include") INCLUDE_DIRECTORIES("./include")

11
unit_test/CMakeLists.txt
View File

@ -30,13 +30,18 @@ if (CMAKE_VERSION VERSION_LESS 2.8.11)
INCLUDE_DIRECTORIES("${gtest_SOURCE_DIR}/include") INCLUDE_DIRECTORIES("${gtest_SOURCE_DIR}/include")
endif() endif()
FIND_LIBRARY(ZTP_LIBRARY libztp.so ${CMAKE_CURRENT_BINARY_DIR}/../) #FIND_LIBRARY(ZTP_LIBRARY libztp.so ${CMAKE_CURRENT_BINARY_DIR}/../)
AUX_SOURCE_DIRECTORY(../../log ZTPLIB_SRC)
AUX_SOURCE_DIRECTORY(../../confingure ZTPLIB_SRC)
AUX_SOURCE_DIRECTORY(../../http ZTPLIB_SRC)
AUX_SOURCE_DIRECTORY(../../json_engine ZTPLIB_SRC)
AUX_SOURCE_DIRECTORY(./test TEST_SRC) AUX_SOURCE_DIRECTORY(./test TEST_SRC)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
# Now simply link against gtest or gtest_main as needed. Eg # Now simply link against gtest or gtest_main as needed. Eg
ADD_EXECUTABLE(ztp_unit ${TEST_SRC}) ADD_EXECUTABLE(ztp_unit ${ZTPLIB_SRC} ${TEST_SRC})
TARGET_LINK_LIBRARIES(ztp_unit ${ZTP_LIBRARY} ztp gtest_main) TARGET_LINK_LIBRARIES(ztp_unit gtest_main)
ADD_TEST(NAME ztp_unit_test COMMAND ztp_unit) ADD_TEST(NAME ztp_unit_test COMMAND ztp_unit)