cmake flags

2025-01-25 11:25:59 +05:00 · 2025-01-25 11:25:59 +05:00 · b0ec03ba36
commit b0ec03ba36
parent 4a230f8491 0f05501ea3
1 changed files with 0 additions and 8 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -68,16 +68,8 @@ target_include_directories(tests PRIVATE
    ${CURL_INCLUDE_DIRS}
 )

-<<<<<<< HEAD
-#target_link_libraries(tests gtest
-#    ${IXWEBSOCKET_LIBRARIES}
-#    ${CURL_LIBRARIES}
-#    gtest_main
-#)
-=======
 target_link_libraries(tests gtest
    ${IXWEBSOCKET_LIBRARIES}
    ${CURL_LIBRARIES}
    gtest_main
 )
->>>>>>> tests