Changeset: 91a79aba1b26 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91a79aba1b26
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Better way to determine python version.
diffs (40 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -660,8 +660,7 @@ if(NOT ${PYTHON2} STREQUAL "NO")
endif()
if(HAVE_PYTHON2)
- string(LENGTH "${PY2_OUPUT_RES}" PY2_OUPUT_LENGTH)
- string(SUBSTRING "${PY2_OUPUT_RES}" 9 ${PY2_OUPUT_LENGTH}
PY2_VERSION) # Remove "Python 2."
+ string(REGEX REPLACE "Python *[0-9]+\\.\([0-9]+\)\\.[0-9]+"
"\\1" PY2_VERSION "${PY2_OUPUT_RES}")
if(PY2_VERSION LESS 6)
set(HAVE_PYTHON2 NO)
if(${PYTHON2} STREQUAL "YES")
@@ -741,8 +740,7 @@ if(NOT ${PYTHON3} STREQUAL "NO")
endif()
if(HAVE_PYTHON3)
- string(LENGTH "${PY3_OUPUT_RES}" PY3_OUPUT_LENGTH)
- string(SUBSTRING "${PY3_OUPUT_RES}" 9 PY3_OUPUT_LENGTH
PY3_VERSION) # Remove "Python 3."
+ string(REGEX REPLACE "Python *[0-9]+\\.\([0-9]+\)\\.[0-9]+"
"\\1" PY3_VERSION "${PY3_OUPUT_RES}")
if(PY3_VERSION LESS 5)
set(HAVE_PYTHON3 NO)
if(${PYTHON3} STREQUAL "YES")
@@ -1386,14 +1384,14 @@ set(PY2_INCLUDE_DIR "")
set(PY2_LIBRARIES "")
set(ENABLE_PY2INTEGRATION "AUTO" CACHE STRING "Enable support for Python 2
integration into MonetDB (default=AUTO)") # Check with HAVE_LIBPY
if(HAVE_PYTHON2 AND NOT ${ENABLE_PY2INTEGRATION} STREQUAL "NO")
- testPythonIntegration(HAVE_LIBPY PY2_INCLUDE_DIR PY2_LIBRARIES "2"
PY2_VERSION ${ENABLE_PY2INTEGRATION} ${PYTHON2_INTERPRETER} "${PYTHON2_CONFIG}")
+ testPythonIntegration(HAVE_LIBPY PY2_INCLUDE_DIR PY2_LIBRARIES "2"
"${PY2_VERSION}" ${ENABLE_PY2INTEGRATION} ${PYTHON2_INTERPRETER}
"${PYTHON2_CONFIG}")
endif()
set(PY3_INCLUDE_DIR "")
set(PY3_LIBRARIES "")
set(ENABLE_PY3INTEGRATION "AUTO" CACHE STRING "enable support for Python 3
integration into MonetDB (default=AUTO)") # Check with HAVE_LIBPY3
if(HAVE_PYTHON3 AND NOT ${ENABLE_PY3INTEGRATION} STREQUAL "NO")
- testPythonIntegration(HAVE_LIBPY3 PY3_INCLUDE_DIR PY3_LIBRARIES "3"
PY3_VERSION ${ENABLE_PY3INTEGRATION} ${PYTHON3_INTERPRETER} "${PYTHON3_CONFIG}")
+ testPythonIntegration(HAVE_LIBPY3 PY3_INCLUDE_DIR PY3_LIBRARIES "3"
"${PY3_VERSION}" ${ENABLE_PY3INTEGRATION} ${PYTHON3_INTERPRETER}
"${PYTHON3_CONFIG}")
endif()
set(ODBC_INCLUDE_DIR "")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
