Skip to content

Commit

Permalink
Refs #4315. Enable building the geometry python library.
Browse files Browse the repository at this point in the history
  • Loading branch information
martyngigg committed Dec 13, 2011
1 parent 5dc02d6 commit 4c9c186
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
1 change: 1 addition & 0 deletions Code/Mantid/Framework/PythonInterface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ set ( TEST_PY_FILES
test/python/ConfigServiceTest.py
test/python/FilePropertyTest.py
test/python/FrameworkManagerTest.py
test/python/IComponentTest.py
test/python/IEventWorkspaceTest.py
test/python/ImportModuleTest.py
test/python/LoggerTest.py
Expand Down
5 changes: 2 additions & 3 deletions Code/Mantid/Framework/PythonInterface/mantid/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,9 @@ set ( CMAKE_SHARED_LIBRARY_PREFIX )

add_subdirectory ( kernel )
add_dependencies ( PythonKernelModule PythonModuleFiles ) # Ensure the module files are in place
#add_subdirectory ( geometry )
add_subdirectory ( geometry )
add_subdirectory ( api )

# Create an overall target
add_custom_target ( PythonInterface DEPENDS PythonKernelModule PythonAPIModule )
#add_custom_target ( PythonInterface DEPENDS PythonKernelModule PythonGeometryModule PythonAPIModule )
add_custom_target ( PythonInterface DEPENDS PythonKernelModule PythonGeometryModule PythonAPIModule )
set_property ( TARGET PythonInterface PROPERTY FOLDER "MantidFramework/Python" )
11 changes: 8 additions & 3 deletions Code/Mantid/Framework/PythonInterface/mantid/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,21 @@
_os.environ['MANTIDPATH'] = _bindir

###############################################################################
# Make most things accessible from mantid namespace
# Make most things accessible from mantid namespace
###############################################################################
import kernel
from kernel import *
# Make the version string accessible in the standard way
__version__ = version_str()

import geometry
from geometry import *

import api
from api import *

###############################################################################
# Make the version string accessible in the standard way
###############################################################################
__version__ = version_str()

###############################################################################
# Aliases
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import unittest
from testhelpers import can_be_instantiated
from mantid import IComponent

class IComponentTest(unittest.TestCase):

def test_IComponent_cannot_be_instantiated(self):
self.assertFalse(can_be_instantiated(IComponent))

0 comments on commit 4c9c186

Please sign in to comment.