Structure: Python module is now standalone (setup.py generated by cmake). Better directory hierarchy

python/CMakeLists.txt

@@ -2,13 +2,13 @@ file( GLOB_RECURSE PYTHON_SRC *.cpp)
 file( GLOB_RECURSE PYTHON_PYSRC *.py)
 add_custom_target( MAKE_PYTHON_SRC_VISIBLE SOURCES ${PYTHON_SRC} ${PYTHON_PYSRC})
 
-set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/external/cmake/setup.py")
+set(SETUP_PY_IN "${CMAKE_MODULES_PATH}/python/setup.py")
 set(SETUP_PY    "${CMAKE_CURRENT_SOURCE_DIR}/setup.py")
 set(OUTPUT      "${CMAKE_CURRENT_BINARY_DIR}/build")
 
 function(JOIN VALUES GLUE OUTPUT)
   string (REGEX REPLACE "([^\\]|^);" "\\1${GLUE}" _TMP_STR "${VALUES}")
-  string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping
+  string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}")
   set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
 endfunction()
 join("${LIBISAAC_SRC}" " " LIBISAAC_SRC_STR)

python/setup.py

@@ -52,19 +52,14 @@ def main():
     cvars['OPT'] = str.join(' ', remove_prefixes(cvars['OPT'].split(), ['-g', '-Wstrict-prototypes']))
     cvars["CFLAGS"] = cvars["BASECFLAGS"] + " " + cvars["OPT"]
     cvars["LDFLAGS"] = '-Wl,--no-as-needed ' + cvars["LDFLAGS"]
-    
-    #Includes
-    include ='${INCLUDE_DIRECTORIES_STR}'.split() +\
-                    ['${CMAKE_CURRENT_SOURCE_DIR}/external/boost/include',
-                      os.path.join(find_module("numpy")[1], "core", "include")]
 
+    #Includes
+    include =''.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")]
     #Sources
-    src =  '${LIBISAAC_SRC_STR}'.split() +\
-            [os.path.join('${CMAKE_CURRENT_SOURCE_DIR}', 'src', sf) \
-                for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']]
-    boostsrc = '${CMAKE_CURRENT_SOURCE_DIR}/external/boost/libs/'
+    src =  'src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/array.cpp src/lib/backend/parse.cpp src/lib/backend/templates/mreduction.cpp src/lib/backend/templates/maxpy.cpp src/lib/backend/templates/mproduct.cpp src/lib/backend/templates/reduction.cpp src/lib/backend/templates/vaxpy.cpp src/lib/backend/templates/base.cpp src/lib/backend/keywords.cpp src/lib/backend/stream.cpp src/lib/backend/binder.cpp src/lib/backend/mapped_object.cpp src/lib/model/model.cpp src/lib/model/predictors/random_forest.cpp src/lib/value_scalar.cpp src/lib/driver/check.cpp src/lib/driver/program.cpp src/lib/driver/platform.cpp src/lib/driver/kernel.cpp src/lib/driver/ndrange.cpp src/lib/driver/event.cpp src/lib/driver/command_queue.cpp src/lib/driver/backend.cpp src/lib/driver/context.cpp src/lib/driver/handle.cpp src/lib/driver/buffer.cpp src/lib/driver/device.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/io.cpp src/lib/symbolic/detect.cpp src/lib/symbolic/expression.cpp '.split() + [os.path.join('src', 'wrap', sf)  for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']]
+    boostsrc = 'external/boost/libs/'
     for s in ['numpy','python','smart_ptr','system','thread']:
-        src = src + [x for x in recursive_glob('${CMAKE_CURRENT_SOURCE_DIR}/external/boost/libs/' + s + '/src/','.cpp') if 'win32' not in x and 'pthread' not in x]
+        src = src + [x for x in recursive_glob('external/boost/libs/' + s + '/src/','.cpp') if 'win32' not in x and 'pthread' not in x]
     # make sure next line succeeds even on Windows
     src = [f.replace("\\", "/") for f in src]
     if sys.platform == "win32":
@@ -83,7 +78,6 @@ def main():
                 author_email='ptillet@g.harvard.edu',
                 license='MPL 2.0',
                 packages=["isaac"],
-                package_dir={ '': '${CMAKE_CURRENT_BINARY_DIR}' },
                 ext_package="isaac",
                 ext_modules=[Extension(
                     '_isaac',src,