!6 clibcni: fix python to python3
Merge pull request !6 from lifeng_isula/master
This commit is contained in:
commit
2d320fcdc3
@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}
|
|||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: yajl yajl-devel
|
BuildRequires: yajl yajl-devel
|
||||||
BuildRequires: python2
|
BuildRequires: python3
|
||||||
|
|
||||||
Requires: yajl
|
Requires: yajl
|
||||||
|
|
||||||
|
|||||||
@ -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 libyajl
|
# check libyajl
|
||||||
pkg_check_modules(PC_LIBYAJL REQUIRED "yajl>=2")
|
pkg_check_modules(PC_LIBYAJL REQUIRED "yajl>=2")
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
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)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user