]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: pass RULE_LAUNCHER_* to cythonReviewed-by: Josh Durgin <jdurgin@redhat.com>
authorSage Weil <sage@redhat.com>
Thu, 14 Apr 2016 12:37:33 +0000 (08:37 -0400)
committerSage Weil <sage@redhat.com>
Thu, 14 Apr 2016 12:37:33 +0000 (08:37 -0400)
cmake: pass RULE_LAUNCHER_* to cython

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Robin H. Johnson <robin.johnson@dreamhost.com>
1  2 
src/pybind/cephfs/CMakeLists.txt
src/pybind/rados/CMakeLists.txt
src/pybind/rbd/CMakeLists.txt

index 61c469823c2fee49990b101d6afcd672996bfcb6,b3f4cf44dc37058cf9b827d94abf2ca575bfbad4..21fcdb55d4b09fc9c0159c61da47a8975637f88f
@@@ -1,8 -1,12 +1,12 @@@
  add_custom_target(cython_cephfs
    COMMAND
+   env
+   CC=${PY_CC}
+   CXX=${PY_CXX}
+   LDSHARED=${PY_LDSHARED}
    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
    CYTHON_BUILD_DIR=${CMAKE_BINARY_DIR}/src/pybind/cephfs
 -  CFLAGS=\"-I${CMAKE_SOURCE_DIR}/src -I${CMAKE_BINARY_DIR}/include -I${CMAKE_SOURCE_DIR}/src/include -std=c++11\"
 +  CFLAGS=\"-iquote ${CMAKE_SOURCE_DIR}/src/include\"
    python ${CMAKE_SOURCE_DIR}/src/pybind/cephfs/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose 
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/cephfs
    DEPENDS rados cephfs)
index 750c8cacafc04619f83a56c7c3f610f931a4c7fe,007ff709555b2ffbbed79de149fd27d9969ab456..efec92b1d810638b4b2d01526e7eeb9d78667d98
@@@ -1,8 -1,12 +1,12 @@@
  add_custom_target(cython_rados
    COMMAND
+   env
+   CC=${PY_CC}
+   CXX=${PY_CXX}
+   LDSHARED=${PY_LDSHARED}
    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
    CYTHON_BUILD_DIR=${CMAKE_BINARY_DIR}/src/pybind/rados
 -  CFLAGS=\"-I${CMAKE_SOURCE_DIR}/src/include -std=c++11\"
 +  CFLAGS=\"-iquote ${CMAKE_SOURCE_DIR}/src/include\"
    python ${CMAKE_SOURCE_DIR}/src/pybind/rados/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose 
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/rados
    DEPENDS rados)
index 84cecd8e1de433014b3a14f566b4153249c2a4a7,6afc639333dd7d271ddcc846f56a53cfbd971026..3757911194c4188f2b1b42ebc18fe67d24f7d90d
@@@ -1,8 -1,12 +1,12 @@@
  add_custom_target(cython_rbd
    COMMAND
+   env
+   CC=${PY_CC}
+   CXX=${PY_CXX}
+   LDSHARED=${PY_LDSHARED}
    LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
    CYTHON_BUILD_DIR=${CMAKE_BINARY_DIR}/src/pybind/rbd
 -  CFLAGS=\"-I${CMAKE_SOURCE_DIR}/src/include -std=c++11\"
 +  CFLAGS=\"-iquote ${CMAKE_SOURCE_DIR}/src/include\"
    python ${CMAKE_SOURCE_DIR}/src/pybind/rbd/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/rbd
    DEPENDS rbd)