YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Support cmake -DPYTHON=python3 (#4667)

Browse Source 
This will help debian packaging of iotjs

JerryScript-DCO-1.0-Signed-off-by: Philippe Coval rzr@users.sf.net
This commit is contained in:
Philippe Coval
2021-05-17 11:37:09 +02:00
committed by GitHub
parent 5180680030
commit a67f198134
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -1
View File
@@ -15,8 +15,11 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required (VERSION 2.8.12)
project (Jerry C) project (Jerry C)
if(NOT DEFINED PYTHON)
set(PYTHON "python")
endif()
# Determining version # Determining version
execute_process(COMMAND python ${CMAKE_SOURCE_DIR}/tools/version.py execute_process(COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/tools/version.py
OUTPUT_VARIABLE JERRY_VERSION OUTPUT_VARIABLE JERRY_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
jerry-core/CMakeLists.txt
+1 -1
View File
@@ -488,7 +488,7 @@ if(ENABLE_AMALGAM)
set(AMALGAM_CONFIG_H "${CMAKE_BINARY_DIR}/amalgam/jerryscript-config.h") set(AMALGAM_CONFIG_H "${CMAKE_BINARY_DIR}/amalgam/jerryscript-config.h")
add_custom_command(OUTPUT ${AMALGAM_CORE_C} ${AMALGAM_CORE_H} add_custom_command(OUTPUT ${AMALGAM_CORE_C} ${AMALGAM_CORE_H}
COMMAND python ${CMAKE_SOURCE_DIR}/tools/amalgam.py COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/tools/amalgam.py
--jerry-core --jerry-core
--output-dir ${CMAKE_BINARY_DIR}/amalgam --output-dir ${CMAKE_BINARY_DIR}/amalgam
DEPENDS ${SOURCE_CORE_FILES} DEPENDS ${SOURCE_CORE_FILES}
jerry-math/CMakeLists.txt
+1 -1
View File
@@ -71,7 +71,7 @@ if(ENABLE_AMALGAM)
set(AMALGAM_MATH_H "${CMAKE_BINARY_DIR}/amalgam/math.h") set(AMALGAM_MATH_H "${CMAKE_BINARY_DIR}/amalgam/math.h")
add_custom_command(OUTPUT ${AMALGAM_MATH_C} ${AMALGAM_MATH_H} add_custom_command(OUTPUT ${AMALGAM_MATH_C} ${AMALGAM_MATH_H}
COMMAND python ${CMAKE_SOURCE_DIR}/tools/amalgam.py COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/tools/amalgam.py
--jerry-math --jerry-math
--output-dir ${CMAKE_BINARY_DIR}/amalgam --output-dir ${CMAKE_BINARY_DIR}/amalgam
DEPENDS ${SOURCE_MATH} DEPENDS ${SOURCE_MATH}
jerry-port/default/CMakeLists.txt
+1 -1
View File
@@ -41,7 +41,7 @@ if(ENABLE_AMALGAM)
set(AMALGAM_PORT_H "${CMAKE_BINARY_DIR}/amalgam/jerryscript-port-default.h") set(AMALGAM_PORT_H "${CMAKE_BINARY_DIR}/amalgam/jerryscript-port-default.h")
add_custom_command(OUTPUT ${AMALGAM_PORT_C} ${AMALGAM_PORT_H} add_custom_command(OUTPUT ${AMALGAM_PORT_C} ${AMALGAM_PORT_H}
COMMAND python ${CMAKE_SOURCE_DIR}/tools/amalgam.py COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/tools/amalgam.py
--jerry-port-default --jerry-port-default
--output-dir ${CMAKE_BINARY_DIR}/amalgam --output-dir ${CMAKE_BINARY_DIR}/amalgam
DEPENDS ${SOURCE_PORT_DEFAULT} DEPENDS ${SOURCE_PORT_DEFAULT}