archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix the build with enabled debugger on Windows (#3531)

Browse Source 
Changes:
- Typo fixed in cmake build system and appveyor config
- Added a new buildoption test

JerryScript-DCO-1.0-Signed-off-by: Csaba Osztrogonác oszi@inf.u-szeged.hu
This commit is contained in:
Csaba Osztrogonác 2020-01-23 15:30:09 +01:00 committed by Robert Fancsik
parent 608bc9e5ff
commit b7a2a153aa
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
appveyor.yml
View File

@ -17,15 +17,15 @@ platform:
environment:
matrix:
- FEATURE_DEBUGGER: ON
- FEATURE_DEBUGGER: OFF
- JERRY_DEBUGGER: ON
- JERRY_DEBUGGER: OFF
# Steps of a job.
init:
- cmake -version
before_build:
- if "%PLATFORM%"=="Win32" cmake -G"Visual Studio 15 2017" -Bbuild -H. -DFEATURE_DEBUGGER=%FEATURE_DEBUGGER%
- if "%PLATFORM%"=="x64" cmake -G"Visual Studio 15 2017 Win64" -Bbuild -H. -DFEATURE_DEBUGGER=%FEATURE_DEBUGGER%
- if "%PLATFORM%"=="Win32" cmake -G"Visual Studio 15 2017" -Bbuild -H. -DJERRY_DEBUGGER=%JERRY_DEBUGGER%
- if "%PLATFORM%"=="x64" cmake -G"Visual Studio 15 2017 Win64" -Bbuild -H. -DJERRY_DEBUGGER=%JERRY_DEBUGGER%
build:
project: build\Jerry.sln
parallel: true

2
jerry-ext/CMakeLists.txt
View File

@ -50,7 +50,7 @@ target_link_libraries(${JERRY_EXT_NAME} jerry-core)
set(JERRY_EXT_PKGCONFIG_LIBS)
if(USING_MSVC AND FEATURE_DEBUGGER)
if(USING_MSVC AND JERRY_DEBUGGER)
target_link_libraries(${JERRY_EXT_NAME} ws2_32)
set(JERRY_EXT_PKGCONFIG_LIBS -lws2_32)
endif()

2
tools/run-tests.py
View File

@ -175,6 +175,8 @@ JERRY_BUILDOPTIONS = [
OPTIONS_GC_MARK_LIMIT),
Options('buildoption_test-single-source',
['--cmake-param=-DENABLE_ALL_IN_ONE_SOURCE=ON']),
Options('buildoption_test-jerry-debugger',
['--jerry-debugger=on']),
]
def get_arguments():