cmake: Cython modules add to cmake

Signed-off-by: Ali Maredia <amaredia@redhat.com>
ceph · Mar 4, 2016 · de1619f · de1619f
1 parent 6bad855
commit de1619f
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 13 deletions.
diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
@@ -12,7 +12,7 @@ function(add_ceph_test test_name test_path)
     CEPH_LIB=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
     LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
     PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src:$ENV{PATH}
-    PYTHONPATH=${CMAKE_SOURCE_DIR}/src/pybind:${CMAKE_SOURCE_DIR}/src/pybind/rados)
+    PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules/lib.linux-x86_64-2.7:${CMAKE_SOURCE_DIR}/src/pybind:${CMAKE_SOURCE_DIR}/src/pybind/rados)
 endfunction()
 
 #sets uniform compiler flags and link libraries

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -522,6 +522,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/
 
 add_subdirectory(ceph-disk)
 add_subdirectory(ceph-detect-init)
+add_subdirectory(pybind)
 
 ## dencoder
 set(dencoder_srcs

diff --git a/src/ceph.in b/src/ceph.in
@@ -92,7 +92,7 @@ elif os.path.exists(os.path.join(os.getcwd(), "CMakeCache.txt")) \
         # Developer mode, but in a cmake build dir instead of the src dir
         lib_path = os.path.join(os.getcwd(), "src")
         pybind_path = os.path.join(src_path, "src", "pybind")
-        pythonlib_path = os.path.join(src_path, "src", get_pythonlib_dir())
+        pythonlib_path = os.path.join(os.getcwd(), "../src/pybind", get_pythonlib_dir())
         respawn_in_path(lib_path, pybind_path, pythonlib_path)
 
         sys.path.insert(0, os.path.join(MYDIR, pybind_path))

diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(CYTHON_MODULE_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules)
+
+add_subdirectory(rados)
+add_subdirectory(rbd)
+add_subdirectory(cephfs)
diff --git a/src/pybind/cephfs/CMakeLists.txt b/src/pybind/cephfs/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_custom_target(cython_cephfs ALL
+  COMMAND
+  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\"
+  python ${CMAKE_SOURCE_DIR}/src/pybind/cephfs/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose 
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DEPENDS rados cephfs)
+
diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py
@@ -42,7 +42,8 @@ def cythonize(x, **kwargs):
     ext_modules = cythonize([
         Extension("cephfs",
             ["cephfs.pyx"],
-            libraries=["cephfs"]
+            libraries=["cephfs"],
+            language="c++"
             )
     ], build_dir=os.environ.get("CYTHON_BUILD_DIR", None), include_path=[
         os.path.join(os.path.dirname(__file__), "..", "rados")]

diff --git a/src/pybind/rados/CMakeLists.txt b/src/pybind/rados/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_custom_target(cython_rados ALL
+  COMMAND
+  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\"
+  python ${CMAKE_SOURCE_DIR}/src/pybind/rados/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose 
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DEPENDS rados)
+
diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
@@ -42,7 +42,8 @@ def cythonize(x, **kwargs):
     ext_modules = cythonize([
         Extension("rados",
             ["rados.pyx"],
-            libraries=["rados"]
+            libraries=["rados"],
+            language="c++"
             )
     ], build_dir=os.environ.get("CYTHON_BUILD_DIR", None)),
     cmdclass={

diff --git a/src/pybind/rbd/CMakeLists.txt b/src/pybind/rbd/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_custom_target(cython_rbd ALL
+  COMMAND
+  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\"
+  python ${CMAKE_SOURCE_DIR}/src/pybind/rbd/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DEPENDS rbd)
+
diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py
@@ -42,7 +42,8 @@ def cythonize(x, **kwargs):
     ext_modules = cythonize([
         Extension("rbd",
             ["rbd.pyx"],
-            libraries=["rbd"]
+            libraries=["rbd"],
+            language="c++"
             )
     ], build_dir=os.environ.get("CYTHON_BUILD_DIR", None), include_path=[
         os.path.join(os.path.dirname(__file__), "..", "rados")]

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
@@ -381,7 +381,10 @@ add_dependencies(check
   ceph_erasure_code_non_regression
   ceph_erasure_code
   ceph-disk
-  ceph-detect-init)
+  ceph-detect-init
+  cython_rados
+  cython_rbd
+  cython_cephfs)
 
 add_ceph_test(test-ceph-helpers.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-ceph-helpers.sh)
 add_ceph_test(erasure-decode-non-regression.sh ${CMAKE_SOURCE_DIR}/qa/workunits/erasure-code/encode-decode-non-regression.sh)
@@ -410,9 +413,8 @@ set_property(TEST
   CEPH_BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
   CEPH_LIB=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
   LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
-  PATH=$ENV{PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src
-  PYTHONPATH=${CMAKE_SOURCE_DIR}/src/pybind
-  )
+  PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src:$ENV{PATH}
+  PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules/lib.linux-x86_64-2.7:${CMAKE_SOURCE_DIR}/src/pybind:${CMAKE_SOURCE_DIR}/src/pybind/rados)
 
 # unittest_admin_socket
 add_executable(unittest_admin_socket EXCLUDE_FROM_ALL

diff --git a/src/test/osd/CMakeLists.txt b/src/test/osd/CMakeLists.txt
@@ -35,10 +35,8 @@ set_property(TEST
   CEPH_BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
   CEPH_LIB=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
   LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
-  PATH=$ENV{PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src
-  PYTHONPATH=${CMAKE_SOURCE_DIR}/src/pybind
-  )
-
+  PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src:$ENV{PATH}
+  PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules/lib.linux-x86_64-2.7:${CMAKE_SOURCE_DIR}/src/pybind:${CMAKE_SOURCE_DIR}/src/pybind/rados)
 
 # unittest_osdmap
 add_executable(unittest_osdmap EXCLUDE_FROM_ALL