Skip to content

Commit b7a2a15

Browse files
ossy-szegedrerobika
authored andcommitted
Fix the build with enabled debugger on Windows (#3531)
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 [email protected]
1 parent 608bc9e commit b7a2a15

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ platform:
1717

1818
environment:
1919
matrix:
20-
- FEATURE_DEBUGGER: ON
21-
- FEATURE_DEBUGGER: OFF
20+
- JERRY_DEBUGGER: ON
21+
- JERRY_DEBUGGER: OFF
2222

2323
# Steps of a job.
2424
init:
2525
- cmake -version
2626
before_build:
27-
- if "%PLATFORM%"=="Win32" cmake -G"Visual Studio 15 2017" -Bbuild -H. -DFEATURE_DEBUGGER=%FEATURE_DEBUGGER%
28-
- if "%PLATFORM%"=="x64" cmake -G"Visual Studio 15 2017 Win64" -Bbuild -H. -DFEATURE_DEBUGGER=%FEATURE_DEBUGGER%
27+
- if "%PLATFORM%"=="Win32" cmake -G"Visual Studio 15 2017" -Bbuild -H. -DJERRY_DEBUGGER=%JERRY_DEBUGGER%
28+
- if "%PLATFORM%"=="x64" cmake -G"Visual Studio 15 2017 Win64" -Bbuild -H. -DJERRY_DEBUGGER=%JERRY_DEBUGGER%
2929
build:
3030
project: build\Jerry.sln
3131
parallel: true

jerry-ext/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ target_link_libraries(${JERRY_EXT_NAME} jerry-core)
5050

5151
set(JERRY_EXT_PKGCONFIG_LIBS)
5252

53-
if(USING_MSVC AND FEATURE_DEBUGGER)
53+
if(USING_MSVC AND JERRY_DEBUGGER)
5454
target_link_libraries(${JERRY_EXT_NAME} ws2_32)
5555
set(JERRY_EXT_PKGCONFIG_LIBS -lws2_32)
5656
endif()

tools/run-tests.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ def skip_if(condition, desc):
175175
OPTIONS_GC_MARK_LIMIT),
176176
Options('buildoption_test-single-source',
177177
['--cmake-param=-DENABLE_ALL_IN_ONE_SOURCE=ON']),
178+
Options('buildoption_test-jerry-debugger',
179+
['--jerry-debugger=on']),
178180
]
179181

180182
def get_arguments():

0 commit comments

Comments
 (0)