diff options
| author | Alberto Garcia Illera <agarciaillera@gmail.com> | 2022-10-20 17:13:12 +1100 |
|---|---|---|
| committer | Alberto Garcia Illera <agarciaillera@gmail.com> | 2022-10-20 17:13:12 +1100 |
| commit | d06a8657d6a29c0950707fa2f0429099190b0ad8 (patch) | |
| tree | 83f1a2903111d7549b18c7b136e325f6b22f6374 | |
| parent | 09fce547dfadc824686aa0bbf4935a04491a0790 (diff) | |
| download | libproxy-git-d06a8657d6a29c0950707fa2f0429099190b0ad8.tar.gz | |
Enable the use of ducktape in Windows systems
| -rw-r--r-- | libproxy/cmake/modules/pacrunner_duktape.cmk | 14 | ||||
| -rw-r--r-- | libproxy/modules/pacrunner_duktape.cpp | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/libproxy/cmake/modules/pacrunner_duktape.cmk b/libproxy/cmake/modules/pacrunner_duktape.cmk index a468125..8bef425 100644 --- a/libproxy/cmake/modules/pacrunner_duktape.cmk +++ b/libproxy/cmake/modules/pacrunner_duktape.cmk @@ -1,11 +1,19 @@ +option(WITH_DUKTAPE "Search for Duktape package" ON) + if(WIN32) - set(DUKTAPE_FOUND 0) + set(DUKTAPE_FOUND 0) + if(WITH_DUKTAPE) + find_package(duktape QUIET) + if(DUKTAPE_FOUND) + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${DUKTAPE_INCLUDE_DIRS}) + link_libraries(${DUKTAPE_LIBRARY}) + set(DUKTAPE_FOUND 1) # find_package sets DUKTAPE_FOUND to True and not 0 + endif() + endif() else() set(DUKTAPE_INCLUDE_DIR "DUKTAPE_INCLUDE_DIR-NOTFOUND" CACHE PATH "Path to Duktape headers") set(DUKTAPE_LIBRARIES "DUKTAPE_LIBRARIES-NOTFOUND" CACHE FILEPATH "Path to Duktape libraries") - option(WITH_DUKTAPE "Search for Duktape package" ON) - if(WITH_DUKTAPE) px_check_modules(DUKTAPE "duktape") diff --git a/libproxy/modules/pacrunner_duktape.cpp b/libproxy/modules/pacrunner_duktape.cpp index 8288e13..12e3df6 100644 --- a/libproxy/modules/pacrunner_duktape.cpp +++ b/libproxy/modules/pacrunner_duktape.cpp @@ -19,7 +19,13 @@ ******************************************************************************/ #include "../extension_pacrunner.hpp" +#ifdef _WIN32 +#include <winsock2.h> +#include <ws2tcpip.h> +#pragma comment(lib, "Ws2_32.lib") +#else #include <unistd.h> // gethostname +#endif using namespace libproxy; #include <duktape.h> |