cmake flags
This commit is contained in:
commit
b0ec03ba36
@ -68,16 +68,8 @@ target_include_directories(tests PRIVATE
|
|||||||
${CURL_INCLUDE_DIRS}
|
${CURL_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
#target_link_libraries(tests gtest
|
|
||||||
# ${IXWEBSOCKET_LIBRARIES}
|
|
||||||
# ${CURL_LIBRARIES}
|
|
||||||
# gtest_main
|
|
||||||
#)
|
|
||||||
=======
|
|
||||||
target_link_libraries(tests gtest
|
target_link_libraries(tests gtest
|
||||||
${IXWEBSOCKET_LIBRARIES}
|
${IXWEBSOCKET_LIBRARIES}
|
||||||
${CURL_LIBRARIES}
|
${CURL_LIBRARIES}
|
||||||
gtest_main
|
gtest_main
|
||||||
)
|
)
|
||||||
>>>>>>> tests
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user