Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

Fix running test programs from within visual studio.

Browse source 
Copy test-server data to a path so that we can run the test-server from
within visual studio without having to copy stuff around.
This commit is contained in:
Joakim Soderberg 2013-02-22 09:28:17 +08:00 • committed by Andy Green
parent b82b0dd118
commit c7ed2be638
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
CMakeLists.txt
View file

@ -544,10 +544,10 @@ if (NOT WITHOUT_TESTAPPS)
# Data files for running the test server. # Data files for running the test server.
set(TEST_SERVER_DATA set(TEST_SERVER_DATA
test-server/favicon.ico ${PROJECT_SOURCE_DIR}/test-server/favicon.ico
test-server/leaf.jpg ${PROJECT_SOURCE_DIR}/test-server/leaf.jpg
test-server/libwebsockets.org-logo.png ${PROJECT_SOURCE_DIR}/test-server/libwebsockets.org-logo.png
test-server/test.html) ${PROJECT_SOURCE_DIR}/test-server/test.html)
# Generate self-signed SSL certs for the test-server. # Generate self-signed SSL certs for the test-server.
if (WITH_SSL AND OPENSSL_EXECUTABLE) if (WITH_SSL AND OPENSSL_EXECUTABLE)
@ -574,6 +574,8 @@ if (NOT WITHOUT_TESTAPPS)
COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}" COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
RESULT_VARIABLE OPENSSL_RETURN_CODE) RESULT_VARIABLE OPENSSL_RETURN_CODE)
message("\n")
if (OPENSSL_RETURN_CODE) if (OPENSSL_RETURN_CODE)
message("!!! Failed to generate SSL certificate:\n${OPENSSL_RETURN_CODE} !!!") message("!!! Failed to generate SSL certificate:\n${OPENSSL_RETURN_CODE} !!!")
endif() endif()
@ -589,6 +591,15 @@ if (NOT WITHOUT_TESTAPPS)
${TEST_SERVER_SSL_KEY} ${TEST_SERVER_SSL_KEY}
${TEST_SERVER_SSL_CERT}) ${TEST_SERVER_SSL_CERT})
endif() endif()
# Copy the file needed to run the server so that the test apps can
# reach them from their default output location
foreach (TEST_FILE ${TEST_SERVER_DATA})
add_custom_command(TARGET test-server
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server"
COMMAND ${CMAKE_COMMAND} -E copy ${TEST_FILE} "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server" VERBATIM)
endforeach()
endif(NOT WITHOUT_SERVER) endif(NOT WITHOUT_SERVER)
if (NOT WITHOUT_CLIENT) if (NOT WITHOUT_CLIENT)

6
win32port/win32helpers/websock-w32.h
View file

@ -55,10 +55,8 @@ extern INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);
/* windows can't cope with this idea, needs assets in cwd */ /* windows can't cope with this idea, needs assets in cwd */
#ifdef INSTALL_DATADIR #ifndef INSTALL_DATADIR
#undef INSTALL_DATADIR
#endif
#define INSTALL_DATADIR "." #define INSTALL_DATADIR "."
#endif
#endif #endif