cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-07 03:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add logic to use different FindPackage for python if cmake is above 3.12 (#454)

Browse Source 
find_package(PythonInterp) has been deprecated since cmake 3.5 and is
throwing a warning as of 3.27 (maybe earlier). Since the minimum
required version is 3.5 for this repo, added a branch to use the
appropriate find_package depending on the version.

Tested with 3.27 (above the split) and 3.10.x (below the split). Both
were successful for me (ubuntu:18.04 & 22.04).
This commit is contained in:
Sébastien Rombauts 2024-08-20 21:37:12 +02:00 committed by GitHub
commit 52b24b9a37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -392,6 +392,8 @@ install(FILES
option(SQLITECPP_RUN_CPPLINT "Run cpplint.py tool for Google C++ StyleGuide." ON) option(SQLITECPP_RUN_CPPLINT "Run cpplint.py tool for Google C++ StyleGuide." ON)
if (SQLITECPP_RUN_CPPLINT) if (SQLITECPP_RUN_CPPLINT)
# The minimum version of CMAKE is 3.5, but as of 3.12 the PythonInterp package is deprecated.
if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
find_package(PythonInterp) find_package(PythonInterp)
if (PYTHONINTERP_FOUND) if (PYTHONINTERP_FOUND)
# add a cpplint target to the "all" target # add a cpplint target to the "all" target
@ -400,6 +402,16 @@ if (SQLITECPP_RUN_CPPLINT)
COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cpplint.py ${CPPLINT_ARG_OUTPUT} ${CPPLINT_ARG_VERBOSE} ${CPPLINT_ARG_LINELENGTH} ${SQLITECPP_SRC} ${SQLITECPP_INC} COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cpplint.py ${CPPLINT_ARG_OUTPUT} ${CPPLINT_ARG_VERBOSE} ${CPPLINT_ARG_LINELENGTH} ${SQLITECPP_SRC} ${SQLITECPP_INC}
) )
endif (PYTHONINTERP_FOUND) endif (PYTHONINTERP_FOUND)
else()
find_package(Python)
if (PYTHON_INTERPRETER_FOUND)
# add a cpplint target to the "all" target
add_custom_target(SQLiteCpp_cpplint
ALL
COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cpplint.py ${CPPLINT_ARG_OUTPUT} ${CPPLINT_ARG_VERBOSE} ${CPPLINT_ARG_LINELENGTH} ${SQLITECPP_SRC} ${SQLITECPP_INC}
)
endif (PYTHON_INTERPRETER_FOUND)
endif()
else (SQLITECPP_RUN_CPPLINT) else (SQLITECPP_RUN_CPPLINT)
message(STATUS "SQLITECPP_RUN_CPPLINT OFF") message(STATUS "SQLITECPP_RUN_CPPLINT OFF")
endif (SQLITECPP_RUN_CPPLINT) endif (SQLITECPP_RUN_CPPLINT)