Fix installing openmc.capi package

SharifAbuDarda · Sep 14, 2017 · c768666 · c768666
1 parent 67cb58d
commit c768666
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -429,7 +429,7 @@ target_link_libraries(${program} ${ldflags} libopenmc)
 add_custom_command(TARGET libopenmc POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy
   $<TARGET_FILE:libopenmc>
-  ${CMAKE_CURRENT_SOURCE_DIR}/openmc/capi/_$<TARGET_FILE_NAME:libopenmc>
+  ${CMAKE_CURRENT_SOURCE_DIR}/openmc/capi/$<TARGET_FILE_NAME:libopenmc>
   COMMENT "Copying libopenmc to Python module directory")
 
 #===============================================================================

diff --git a/docs/source/capi/index.rst b/docs/source/capi/index.rst
@@ -4,7 +4,7 @@
 C API
 =====
 
-.. c:function:: void openmc_calculate_voumes()
+.. c:function:: void openmc_calculate_volumes()
 
    Run a stochastic volume calculation
 

diff --git a/openmc/capi/__init__.py b/openmc/capi/__init__.py
@@ -27,7 +27,7 @@
 
 # Open shared library
 _filename = pkg_resources.resource_filename(
-    __name__, '_libopenmc.{}'.format(_suffix))
+    __name__, 'libopenmc.{}'.format(_suffix))
 _dll = CDLL(_filename)
 
 from .error import *

diff --git a/setup.py b/setup.py
@@ -30,13 +30,13 @@
 
 kwargs = {'name': 'openmc',
           'version': version,
-          'packages': ['openmc', 'openmc.data', 'openmc.mgxs', 'openmc.model',
-                       'openmc.stats'],
+          'packages': ['openmc', 'openmc.capi', 'openmc.data', 'openmc.mgxs',
+                       'openmc.model', 'openmc.stats'],
           'scripts': glob.glob('scripts/openmc-*'),
 
           # Data files and librarries
           'package_data': {
-              'openmc': ['_libopenmc.{}'.format(suffix)],
+              'openmc.capi': ['libopenmc.{}'.format(suffix)],
               'openmc.data': ['mass.mas12', 'fission_Q_data_endfb71.h5']
           },
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     C API
     =====
-    .. c:function:: void openmc_calculate_voumes()
+    .. c:function:: void openmc_calculate_volumes()
        Run a stochastic volume calculation
@@ Expand Down @@