YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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
Download Patch File Download Diff File Expand all files Collapse all files
appveyor.yml
+4 -4
View File
@@ -17,15 +17,15 @@ platform:
environment: environment:
matrix: matrix:
- FEATURE_DEBUGGER: ON - JERRY_DEBUGGER: ON
- FEATURE_DEBUGGER: OFF - JERRY_DEBUGGER: OFF
# Steps of a job. # Steps of a job.
init: init:
- cmake -version - cmake -version
before_build: before_build:
- if "%PLATFORM%"=="Win32" cmake -G"Visual Studio 15 2017" -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. -DFEATURE_DEBUGGER=%FEATURE_DEBUGGER% - if "%PLATFORM%"=="x64" cmake -G"Visual Studio 15 2017 Win64" -Bbuild -H. -DJERRY_DEBUGGER=%JERRY_DEBUGGER%
build: build:
project: build\Jerry.sln project: build\Jerry.sln
parallel: true parallel: true
jerry-ext/CMakeLists.txt
+1 -1
View File
@@ -50,7 +50,7 @@ target_link_libraries(${JERRY_EXT_NAME} jerry-core)
set(JERRY_EXT_PKGCONFIG_LIBS) 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) target_link_libraries(${JERRY_EXT_NAME} ws2_32)
set(JERRY_EXT_PKGCONFIG_LIBS -lws2_32) set(JERRY_EXT_PKGCONFIG_LIBS -lws2_32)
endif() endif()
tools/run-tests.py
+2
View File
@@ -175,6 +175,8 @@ JERRY_BUILDOPTIONS = [
OPTIONS_GC_MARK_LIMIT), OPTIONS_GC_MARK_LIMIT),
Options('buildoption_test-single-source', Options('buildoption_test-single-source',
['--cmake-param=-DENABLE_ALL_IN_ONE_SOURCE=ON']), ['--cmake-param=-DENABLE_ALL_IN_ONE_SOURCE=ON']),
Options('buildoption_test-jerry-debugger',
['--jerry-debugger=on']),
] ]
def get_arguments(): def get_arguments():