[Mobies-commit] [commit] r4093 - UDM/trunk/src/UdmPython

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Aug 17 14:54:05 2012
New Revision: 4093

Log:
Need to link against libudm, and export initudm properly

Modified:
   UDM/trunk/src/UdmPython/UdmPython.cpp
   UDM/trunk/src/UdmPython/setup.py

Modified: UDM/trunk/src/UdmPython/UdmPython.cpp
==============================================================================
--- UDM/trunk/src/UdmPython/UdmPython.cpp	Fri Aug 17 14:25:31 2012	(r4092)
+++ UDM/trunk/src/UdmPython/UdmPython.cpp	Fri Aug 17 14:54:05 2012	(r4093)
@@ -538,7 +538,14 @@
 }
 }
 
+#ifdef _WIN32
+#ifndef UDM_PY_MODULE_NAME
+#error UDM_PY_MODULE_NAME undefined
+#endif
 BOOST_PYTHON_MODULE(UDM_PY_MODULE_NAME)
+#else
+BOOST_PYTHON_MODULE(udm)
+#endif
 {
 	class_<Udm::Object>("Object")
 		.add_property("type", Object_type)

Modified: UDM/trunk/src/UdmPython/setup.py
==============================================================================
--- UDM/trunk/src/UdmPython/setup.py	Fri Aug 17 14:25:31 2012	(r4092)
+++ UDM/trunk/src/UdmPython/setup.py	Fri Aug 17 14:54:05 2012	(r4093)
@@ -24,7 +24,8 @@
 setup_args['ext_modules'] = [
   Extension('udm',
     ['UdmPython.cpp'],
-    libraries=['boost_python'], # TODO: udm?
+    libraries=['boost_python', 'udm'], # TODO: udm?
+    library_dirs = [os.path.join(this_dir, '../../lib/.libs')],
     include_dirs=['/usr/include/udm/', os.path.join(this_dir, '../../include')])
 ]
 if platform.system() == 'Windows':