From 0c5fb822dd22cf561c4e574d9407c1a895618a2a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 4 Jul 2016 11:26:28 +0800 Subject: [PATCH] cmake: refactor distutils_install_module to follow the pattern of distutils_install_cython_module Signed-off-by: Kefu Chai --- cmake/modules/Distutils.cmake | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake index 7394ac6ce83b5..bebd43d6b5d2b 100644 --- a/cmake/modules/Distutils.cmake +++ b/cmake/modules/Distutils.cmake @@ -52,16 +52,14 @@ endfunction(distutils_add_cython_module) function(distutils_install_cython_module name) install(CODE " + set(options --prefix=${CMAKE_INSTALL_PREFIX}) if(DEFINED ENV{DESTDIR}) if(EXISTS /etc/debian_version) - set(options --install-layout=deb) - else() - set(options --prefix=/usr) + list(APPEND options --install-layout=deb) endif() - set(root --root=\$ENV{DESTDIR}) + list(APPEND options --root=\$ENV{DESTDIR}) else() - set(options \"--prefix=${CMAKE_INSTALL_PREFIX}\") - set(root --root=/) + list(APPEND options --root=/) endif() execute_process( COMMAND env @@ -69,7 +67,7 @@ function(distutils_install_cython_module name) CFLAGS=\"-iquote ${CMAKE_SOURCE_DIR}/src/include\" ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose - install \${options} \${root} --verbose + install \${options} --verbose --single-version-externally-managed --record /dev/null WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\" RESULT_VARIABLE install_res) -- 2.39.5