|
|
|
@ -456,7 +456,7 @@ include_directories(include)
|
|
|
|
|
include_directories(vendor/cppbackport-master/lib)
|
|
|
|
|
include_directories(${sodium_INCLUDE_DIR})
|
|
|
|
|
|
|
|
|
|
if (WIN32)
|
|
|
|
|
if (MSVC)
|
|
|
|
|
include_directories(contrib/msc/include)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
@ -477,13 +477,13 @@ add_subdirectory(${GTEST_DIR})
|
|
|
|
|
include_directories(${GTEST_DIR}/include ${GTEST_DIR})
|
|
|
|
|
add_executable(${TEST_EXE} ${TEST_SRC})
|
|
|
|
|
|
|
|
|
|
if (WIN32)
|
|
|
|
|
if (MSVC)
|
|
|
|
|
target_link_libraries(${TEST_EXE} ${STATIC_LINK_LIBS} gtest_main ${STATIC_LIB} ws2_32 iphlpapi)
|
|
|
|
|
elseif (MINGW)
|
|
|
|
|
target_link_libraries(${TEST_EXE} ${STATIC_LINK_LIBS} gtest_main ${STATIC_LIB} stdc++fs iphlpapi ws2_32)
|
|
|
|
|
else()
|
|
|
|
|
target_link_libraries(${TEST_EXE} ${STATIC_LINK_LIBS} gtest_main ${STATIC_LIB})
|
|
|
|
|
endif(WIN32)
|
|
|
|
|
endif(MSVC)
|
|
|
|
|
|
|
|
|
|
if(WITH_STATIC)
|
|
|
|
|
add_library(${STATIC_LIB} STATIC ${LIB_SRC})
|
|
|
|
|