update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / cmake / modules / Distutils.cmake

diff --git a/ceph/cmake/modules/Distutils.cmake b/ceph/cmake/modules/Distutils.cmake
index 5fe929499d3cde7bba5129281d059a62cc2ca876..ff01aaf818a71d161c8d2c2ae65d827f1e0b772e 100644 (file)
--- a/ceph/cmake/modules/Distutils.cmake
+++ b/ceph/cmake/modules/Distutils.cmake
@@ -25,9 +25,9 @@ function(distutils_install_module name)
       list(APPEND options
         --root=\$ENV{DESTDIR}
         --single-version-externally-managed)
-      if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
-        list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
-      endif()
+    endif()
+    if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
+      list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
     endif()
     execute_process(
     COMMAND ${Python3_EXECUTABLE}
@@ -49,7 +49,7 @@ function(distutils_add_cython_module target name src)
   string(STRIP "${CMAKE_CXX_COMPILER_ARG1}" cxx_compiler_arg1)
   # Note: no quotes, otherwise distutils will execute "/usr/bin/ccache gcc"
   # CMake's implicit conversion between strings and lists is wonderful, isn't it?
-  string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS})
+  set(cflags ${COMPILE_OPTIONS})
   list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w)
   # This little bit of magic wipes out __Pyx_check_single_interpreter()
   # Note: this is reproduced in distutils_install_cython_module