Changeset: 0c64fbcf9348 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c64fbcf9348
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Make sure find_library doesn't use the same cache value for python2 and python3
link libraries by using different variable names.
diffs (16 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1313,9 +1313,9 @@ endif()
function(testPythonIntegration HAVE_LIBPY PY_INCLUDE_DIR PY_LIBRARIES
PY_MAJOR_VERSION PY_MINOR_VERSION INTEGRATION_ENABLED INTERPRETER_PATH
INTERPRETER_CONFIG)
if(WIN32)
- find_library(PYTHON_LIBRARY
"python${PY_MAJOR_VERSION}${PY_MINOR_VERSION}")
- if(PYTHON_LIBRARY)
- set(${PY_LIBRARIES} "${PYTHON_LIBRARY}" PARENT_SCOPE)
+ find_library(PYTHON${PY_MAJOR_VERSION}_LIBRARY
"python${PY_MAJOR_VERSION}${PY_MINOR_VERSION}")
+ if(PYTHON${PY_MAJOR_VERSION}_LIBRARY)
+ set(${PY_LIBRARIES}
"${PYTHON${PY_MAJOR_VERSION}_LIBRARY}" PARENT_SCOPE)
elseif(${INTEGRATION_ENABLED} STREQUAL "AUTO")
message(WARNING "Python library
(python${PY_MAJOR_VERSION}${PY_MINOR_VERSION}) not found")
else()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
