]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: creage egg_info files into build directory
authorKefu Chai <kchai@redhat.com>
Fri, 8 Jul 2016 06:57:41 +0000 (14:57 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 8 Jul 2016 07:02:59 +0000 (15:02 +0800)
otherwise they will go to the source tree, and "git ls-files" will list
them as untracked files, which annoy gitbuilder-ceph-tarball*-cmake
gitbuilders. like

+ echo 'error: Added files:'
error: Added files:
+ cat .git/added-files
src/pybind/rados/rados.egg-info/PKG-INFO
...

Signed-off-by: Kefu Chai <kchai@redhat.com>
cmake/modules/Distutils.cmake

index b4a90732b0d82f7042f8735df387a1678027cc93..6ba1c378b9204ab731459de1522e2ec52543d0be 100644 (file)
@@ -66,11 +66,13 @@ function(distutils_install_cython_module name)
        COMMAND env
            CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
            CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+           CC=${CMAKE_C_COMPILER}
            CFLAGS=\"-iquote ${CMAKE_SOURCE_DIR}/src/include\"
            ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
            build --build-base ${CYTHON_MODULE_DIR} --verbose
-           install \${options} --verbose
-           --single-version-externally-managed --record /dev/null
+           install \${options} --single-version-externally-managed --record /dev/null
+           egg_info --egg-base ${CMAKE_CURRENT_BINARY_DIR}
+           --verbose
        WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\"
        RESULT_VARIABLE install_res)
     if(NOT \"\${install_res}\" STREQUAL 0)