caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace deprecated method of finding Python 3

Browse Source
This commit is contained in:
LAK132 2022-08-16 20:14:43 +09:30
parent b9b16eaa53
commit ae8966040b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -173,10 +173,10 @@ if (BUILD_GUI)
set(CMAKE_ENABLE_EXPORTS ON) set(CMAKE_ENABLE_EXPORTS ON)
endif() endif()
find_package(PythonInterp 3.5 REQUIRED) find_package(Python3 3.5 REQUIRED COMPONENTS Interpreter)
if (BUILD_PYTHON) if (BUILD_PYTHON)
# TODO: sensible minimum Python version # TODO: sensible minimum Python version
find_package(PythonLibs 3.5 REQUIRED) find_package(Python3 3.5 REQUIRED COMPONENTS Development)
else() else()
add_definitions("-DNO_PYTHON") add_definitions("-DNO_PYTHON")
endif() endif()
@ -221,7 +221,7 @@ if (NOT DEFINED PYBIND11_INCLUDE_DIR)
set(PYBIND11_INCLUDE_DIR "3rdparty/pybind11/include") set(PYBIND11_INCLUDE_DIR "3rdparty/pybind11/include")
endif() endif()
include_directories(common/kernel/ common/place/ common/route/ json/ frontend/ 3rdparty/json11/ ${PYBIND11_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) include_directories(common/kernel/ common/place/ common/route/ json/ frontend/ 3rdparty/json11/ ${PYBIND11_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS})
if(BUILD_HEAP) if(BUILD_HEAP)
find_package (Eigen3 REQUIRED NO_MODULE) find_package (Eigen3 REQUIRED NO_MODULE)
@ -339,7 +339,7 @@ foreach (family ${ARCH})
target_link_libraries(${target} LINK_PUBLIC gui_${family} ${GUI_LIBRARY_FILES_${ufamily}}) target_link_libraries(${target} LINK_PUBLIC gui_${family} ${GUI_LIBRARY_FILES_${ufamily}})
endif() endif()
if (BUILD_PYTHON) if (BUILD_PYTHON)
target_link_libraries(${target} LINK_PUBLIC ${PYTHON_LIBRARIES}) target_link_libraries(${target} LINK_PUBLIC ${Python3_LIBRARIES})
if (STATIC_BUILD) if (STATIC_BUILD)
target_link_libraries(${target} LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES} ${EXPAT_LIBRARIES}) target_link_libraries(${target} LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES} ${EXPAT_LIBRARIES})
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")