packages/lcr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!8 lcr: replace python to python3

Browse Source 
Merge pull request !8 from lifeng_isula/master
This commit is contained in:
openeuler-ci-bot 2020-02-26 12:00:45 +08:00 committed by Gitee
commit 157cb17f0c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/checker.cmake
View File

@ -10,9 +10,9 @@ else()
endif() endif()
endmacro() endmacro()
#check python #check python3
find_program(CMD_PYTHON python) find_program(CMD_PYTHON python3)
_CHECK(CMD_PYTHON "CMD_PYTHON-NOTFOUND" "python") _CHECK(CMD_PYTHON "CMD_PYTHON-NOTFOUND" "python3")
# check liblxc # check liblxc
pkg_check_modules(PC_LIBLXC REQUIRED "lxc>=3") pkg_check_modules(PC_LIBLXC REQUIRED "lxc>=3")

2
lcr.spec
View File

@ -14,7 +14,7 @@ BuildRequires: cmake
BuildRequires: lxc BuildRequires: lxc
BuildRequires: lxc-devel BuildRequires: lxc-devel
BuildRequires: yajl yajl-devel BuildRequires: yajl yajl-devel
BuildRequires: python2 BuildRequires: python3
Requires: rsync bridge-utils lxc Requires: rsync bridge-utils lxc
ExclusiveArch: x86_64 aarch64 ExclusiveArch: x86_64 aarch64

2
src/json/schema/CMakeLists.txt
View File

@ -1,6 +1,6 @@
project (JSONGenerator) project (JSONGenerator)
set(cmdpath python) set(cmdpath python3)
set(pysrcpath ${CMAKE_CURRENT_SOURCE_DIR}/src/generate.py) set(pysrcpath ${CMAKE_CURRENT_SOURCE_DIR}/src/generate.py)
set(schemapath ${CMAKE_CURRENT_SOURCE_DIR}/schema) set(schemapath ${CMAKE_CURRENT_SOURCE_DIR}/schema)
set(outputpath ${CMAKE_BINARY_DIR}/json) set(outputpath ${CMAKE_BINARY_DIR}/json)