we can work with extention now!

cbtxs · Jun 6, 2020 · b56bf7a · b56bf7a
1 parent 7bbbf9b
commit b56bf7a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/fealpy/extent/__init__.py b/fealpy/extent/__init__.py
diff --git a/setup_linux_with_extent.py b/setup_linux_with_extent.py
@@ -15,7 +15,7 @@ def __str__(self):
 
 ext_modules = [
     Extension(
-        "fealpy.cgal",
+        "fealpy.extent.cgal",
         [
             "src/cgal/cgal.cpp",
         ],
@@ -37,7 +37,7 @@ def __str__(self):
           author='Huayi Wei',
           author_email='[email protected]',
           license='GNU',
-          packages=['fealpy', 'fealpy.cgal'],
+          packages=['fealpy'],
           install_requires=[
               'numpy',
               'scipy',

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,9 +1,6 @@
 find_package(pybind11 REQUIRED)
 
-find_package(CGAL REQUIRED)
-include(${CGAL_USE_FILE})
 
-file(GLOB SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
-pybind11_add_module(fealpy_extent ${SRCS})
+add_subdirectory(cgal)
+#add_subdirectory(detri2)
 
-target_link_libraries(fealpy_extent PRIVATE ${CGAL_LIBRARIES})
diff --git a/src/cgal/CMakeLists.txt b/src/cgal/CMakeLists.txt
@@ -0,0 +1,7 @@
+find_package(CGAL REQUIRED)
+include(${CGAL_USE_FILE})
+
+#file(GLOB SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
+pybind11_add_module(cgal cgal.cpp)
+target_link_libraries(cgal PRIVATE ${CGAL_LIBRARIES})
+set_target_properties(cgal PROPERTIES OUTPUT_NAME fealpy/cgal)
diff --git a/src/cgal/cgal.cpp b/src/cgal/cgal.cpp
@@ -90,7 +90,8 @@ int add(int i, int j)
     return i + j;
 }
 
-PYBIND11_MODULE(fealpy_extent, m){
+PYBIND11_MODULE(cgal, m){
+    //m.attr("__name__") = "fealpy.cgal";
     m.doc() = "This is a module extent of fealpy package!";
     m.def("add", &add,  "A function which adds two numbers");
     m.def("generate_surface_mesh",