2021-11-09 20:00:28 +00:00
|
|
|
--- nfs-ganesha-4-rc3/src/CMakeLists.txt.orig 2021-11-08 18:24:19.024041776 -0500
|
|
|
|
|
+++ nfs-ganesha-4-rc3/src/CMakeLists.txt 2021-11-09 13:54:02.553226811 -0500
|
|
|
|
|
@@ -558,11 +558,11 @@
|
|
|
|
|
|
|
|
|
|
gopt_test(USE_ADMIN_TOOLS)
|
|
|
|
|
if (USE_ADMIN_TOOLS)
|
|
|
|
|
- find_package (Python COMPONENTS Interpreter Development)
|
|
|
|
|
- if (NOT Python_Interpreter_FOUND)
|
|
|
|
|
+ find_package(PythonInterp ${USE_ADMIN_TOOLS_REQUIRED})
|
|
|
|
|
+ if (NOT PYTHONINTERP_FOUND)
|
|
|
|
|
message(WARNING "Cannot find python. Disablin admin tools")
|
|
|
|
|
set(USE_ADMIN_TOOLS OFF)
|
|
|
|
|
- endif (NOT Python_Interpreter_FOUND)
|
|
|
|
|
+ endif (NOT PYTHONINTERP_FOUND)
|
|
|
|
|
endif (USE_ADMIN_TOOLS)
|
|
|
|
|
|
|
|
|
|
gopt_test(USE_GUI_ADMIN_TOOLS)
|
2021-11-17 14:48:47 +00:00
|
|
|
--- nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt.orig 2021-11-17 09:22:20.860134361 -0500
|
|
|
|
|
+++ nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt 2021-11-17 09:41:47.651949504 -0500
|
|
|
|
|
@@ -44,7 +44,7 @@
|
|
|
|
|
Ganesha/QtUI/ui_log_dialog.ui
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
-if(Python_FOUND)
|
|
|
|
|
+if(PYTHONINTERP_FOUND)
|
|
|
|
|
set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
|
|
|
|
|
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
|
|
|
|
|
set(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/ganeshactl_timestamp")
|
|
|
|
|
@@ -118,7 +118,7 @@
|
|
|
|
|
|
|
|
|
|
add_custom_command(
|
|
|
|
|
OUTPUT ${OUTPUT}
|
|
|
|
|
- COMMAND ${Python_EXECUTABLE} "${SETUP_PY}" build
|
|
|
|
|
+ COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}" build
|
|
|
|
|
COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
|
|
|
|
|
DEPENDS ${GANESHA_SRCS} ${UI_PY_FILES} ${SCRIPTS}
|
|
|
|
|
)
|
|
|
|
|
@@ -127,9 +127,9 @@
|
|
|
|
|
|
|
|
|
|
install(
|
|
|
|
|
CODE
|
|
|
|
|
- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
|
|
|
|
|
+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
|
|
|
|
|
)
|
|
|
|
|
-endif(Python_FOUND)
|
|
|
|
|
+endif(PYTHONINTERP_FOUND)
|
|
|
|
|
|
|
|
|
|
# Man page
|
|
|
|
|
set(man8_file ganesha_conf.man)
|
|
|
|
|
--- nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt.orig 2021-11-17 09:22:55.938555754 -0500
|
|
|
|
|
+++ nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt 2021-11-17 09:41:32.836208727 -0500
|
|
|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
|
|
|
|
|
|
if(USE_FSAL_GPFS)
|
|
|
|
|
- if(Python_FOUND)
|
|
|
|
|
+ if(PYTHONINTERP_FOUND)
|
|
|
|
|
set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
|
|
|
|
|
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
|
|
|
|
|
set(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/gpfs_epoch_timestamp")
|
|
|
|
|
@@ -38,7 +38,7 @@
|
|
|
|
|
add_custom_command(
|
|
|
|
|
OUTPUT ${OUTPUT}
|
|
|
|
|
COMMAND ${CMAKE_COMMAND} -E touch __init__.py
|
|
|
|
|
- COMMAND ${Python_EXECUTABLE} "${SETUP_PY}" build
|
|
|
|
|
+ COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}" build
|
|
|
|
|
COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
|
|
|
|
|
DEPENDS ${GPFS_EPOCH_SRCS} ${SCRIPTS}
|
|
|
|
|
)
|
|
|
|
|
@@ -47,7 +47,7 @@
|
|
|
|
|
|
|
|
|
|
install(
|
|
|
|
|
CODE
|
|
|
|
|
- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
|
|
|
|
|
+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
|
|
|
|
|
)
|
|
|
|
|
- endif(Python_FOUND)
|
|
|
|
|
+ endif(PYTHONINTERP_FOUND)
|
|
|
|
|
endif(USE_FSAL_GPFS)
|
