Changeset: e19b15eaf440 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e19b15eaf440
Modified Files:
sql/backends/monet5/UDF/CMakeLists.txt
sql/backends/monet5/UDF/capi/CMakeLists.txt
sql/backends/monet5/UDF/capi/boot.py
Branch: cmake-fun
Log Message:
We require python to compile capi.
diffs (33 lines):
diff --git a/sql/backends/monet5/UDF/CMakeLists.txt
b/sql/backends/monet5/UDF/CMakeLists.txt
--- a/sql/backends/monet5/UDF/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/CMakeLists.txt
@@ -7,7 +7,7 @@
#]]
add_subdirectory(udf)
-if(NOT WIN32)
+if(NOT WIN32 AND HAVE_PYTHON3)
add_subdirectory(capi)
endif()
if(HAVE_LIBPY)
diff --git a/sql/backends/monet5/UDF/capi/CMakeLists.txt
b/sql/backends/monet5/UDF/capi/CMakeLists.txt
--- a/sql/backends/monet5/UDF/capi/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/capi/CMakeLists.txt
@@ -23,7 +23,7 @@ set_target_properties(capi PROPERTIES OU
target_compile_definitions(capi PRIVATE LIBCUDF)
# Generate cheader.text.h file
-add_custom_command(OUTPUT cheader COMMAND python
${CMAKE_CURRENT_SOURCE_DIR}/boot.py
+add_custom_command(OUTPUT cheader COMMAND "${Python3_EXECUTABLE}"
${CMAKE_CURRENT_SOURCE_DIR}/boot.py
${CMAKE_CURRENT_SOURCE_DIR}/cheader.h
${CMAKE_CURRENT_BINARY_DIR}/cheader.text.h
BYPRODUCTS cheader.text.h)
add_custom_target(do_cheader DEPENDS cheader)
diff --git a/sql/backends/monet5/UDF/capi/boot.py
b/sql/backends/monet5/UDF/capi/boot.py
--- a/sql/backends/monet5/UDF/capi/boot.py
+++ b/sql/backends/monet5/UDF/capi/boot.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
