diff --git a/CMakeLists.txt b/CMakeLists.txt index 10bdba5606715052e19b5005bce77f39c8be8ed6..bb708ac41b1bc918b6b070fdd3e7b5e239360d5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,11 @@ include(cpplint) conan_or_find_package(cppcheck REQUIRED) include(cppcheck) + +find_package(PythonInterp REQUIRED) + add_subdirectory(demos) +add_subdirectory(brunel_example) #-------------------------------------------------------------------- # on OS X diff --git a/demos/brunel-simulation/CMakeLists.txt b/brunel_example/CMakeLists.txt similarity index 84% rename from demos/brunel-simulation/CMakeLists.txt rename to brunel_example/CMakeLists.txt index 14ac85f5bac12fe1802cafe2a5bfdbdfcda71905..4bcfcfd6494a095545e3cbca253b741f25d10cdc 100644 --- a/demos/brunel-simulation/CMakeLists.txt +++ b/brunel_example/CMakeLists.txt @@ -21,9 +21,10 @@ get_filename_component(NEST_DIR ${with-nest} DIRECTORY) + file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/run_sim.sh CONTENT "source ${NEST_DIR}/bin/nest_vars.sh -PYTHONPATH=${PYNIV_OUTPUT_DIR}/..:/home/devs/Desktop/projects/nesci/build/pynesci:/home/devs/Desktop/projects/contra/build/pycontra:$PYTHONPATH ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${NEST_SIM_SOURCE}" +${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${NEST_SIM_SOURCE}" ) \ No newline at end of file diff --git a/demos/brunel-simulation/brunel_example.py b/brunel_example/brunel_example.py similarity index 100% rename from demos/brunel-simulation/brunel_example.py rename to brunel_example/brunel_example.py diff --git a/demos/brunel-simulation/nest_sim.py b/brunel_example/nest_sim.py similarity index 100% rename from demos/brunel-simulation/nest_sim.py rename to brunel_example/nest_sim.py diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index a121da6b638b375a41014848fa6b0f5fc0b65aee..e81ee7ff3c8c5647a62a882fd664053968dc0dee 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -19,5 +19,4 @@ # limitations under the License. #------------------------------------------------------------------------------- -add_subdirectory(brunel-simulation) # add_subdirectory(QVTK-Demo)