Refactor conngen module to be a ConnBuilder

CMakeLists.txt

@@ -219,9 +219,6 @@ add_custom_target( installcheck
 ##################        Define Subdirectories here          ##################
 ################################################################################
 
-if ( HAVE_LIBNEUROSIM )
-  add_subdirectory( conngen )
-endif ()
 add_subdirectory( doc )
 add_subdirectory( examples )
 add_subdirectory( extras )
@@ -314,11 +311,6 @@ foreach ( INC ${ALL_INCLUDES_tmp} ${with-includes} )
 endforeach ()
 set( ALL_INCLUDES "${ALL_INCLUDES} ${SIONLIB_INCLUDE}" )
 
-if ( HAVE_LIBNEUROSIM )
-  set( ALL_LIBS "-lconngen ${ALL_LIBS}" )
-  set( ALL_INCLUDES "-I${PROJECT_SOURCE_DIR}/conngen ${ALL_INCLUDES}" )
-endif ()
-
 ################################################################################
 ##################           File generation here             ##################
 ################################################################################

cmake/FindLibNeurosim.cmake

@@ -35,18 +35,10 @@ find_library( NEUROSIM_LIBRARY
     NAMES neurosim
     HINTS ${LIBNEUROSIM_ROOT}/lib
     )
-
-if ( ${PYTHON_VERSION} VERSION_GREATER "3" )
-    find_library( PYNEUROSIM_LIBRARY
-        NAMES py3neurosim
-        HINTS ${LIBNEUROSIM_ROOT}/lib
-    )
-else ()
-    find_library( PYNEUROSIM_LIBRARY
-        NAMES pyneurosim
-        HINTS ${LIBNEUROSIM_ROOT}/lib
+find_library( PYNEUROSIM_LIBRARY
+    NAMES py3neurosim
+    HINTS ${LIBNEUROSIM_ROOT}/lib
     )
-endif ()
 
 if ( EXISTS "${LIBNEUROSIM_INCLUDE_DIR}/neurosim/version.h" )
   file( STRINGS "${LIBNEUROSIM_INCLUDE_DIR}/neurosim/version.h"

cmake/ProcessOptions.cmake

@@ -525,7 +525,6 @@ function( NEST_PROCESS_WITH_LIBNEUROSIM )
       set( HAVE_LIBNEUROSIM ON PARENT_SCOPE )
 
       include_directories( ${LIBNEUROSIM_INCLUDE_DIRS} )
-      # is linked in conngen/CMakeLists.txt
 
       # export found variables to parent scope
       set( LIBNEUROSIM_FOUND "${LIBNEUROSIM_FOUND}" PARENT_SCOPE )
@@ -629,9 +628,6 @@ function( NEST_DEFAULT_MODULES )
     # requires HAVE_LIBNEUROSIM set
     # Static modules
     set( SLI_MODULES models )
-    if ( HAVE_LIBNEUROSIM )
-      set( SLI_MODULES ${SLI_MODULES} conngen )
-    endif ()
     set( SLI_MODULES ${SLI_MODULES} PARENT_SCOPE )
 
     set( SLI_MODULE_INCLUDE_DIRS )