* pyeo

eo/src/pyeo/CMakeLists.txt

@@ -27,23 +27,23 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
-# python
 IF(APPLE)
   # osx internal
   FIND_LIBRARY(APPLE_CARBON Carbon)
 ENDIF(APPLE)
 
-
 # includes
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(../)
+#INCLUDE_DIRECTORIES(../)
 
 # source
 FILE(GLOB SOURCES *.cpp)
 
+# EO dependencies
 SET(EO_SOURCES
-  ../eoFunctorStore.cpp
+  ${EO_SOURCE_DIR}/src/eoFunctorStore.cpp
-  ../utils/eoLogger.cpp
+  ${EO_SOURCE_DIR}/src/utils/eoLogger.cpp
+  ${EO_SOURCE_DIR}/src/utils/eoParallel.cpp
   )
 
 # shared library

eo/src/pyeo/test/maxone.py

@@ -2,7 +2,7 @@ import sys
 sys.path.append('..')
 
 print 'importing pyeo'
-from PyEO import *
+from libPyEO import *
 print 'done'
 
 from copy import copy

eo/src/pyeo/test/run_tests.sh

@@ -5,5 +5,3 @@ do
     python $i > /dev/null
 
 done
-
-

eo/src/pyeo/test/test_transform.py

@@ -1,7 +1,7 @@
 """Test script for the eoSGATranform class"""
 
 from copy import deepcopy
-from PyEO import *
+from libPyEO import *
 from maxone import *
 
 pop = eoPop()