From cd4fca19c752b84a2f0585bb2e8c3846c598f5bd Mon Sep 17 00:00:00 2001 From: Simon Oehrl <oehrl@vr.rwth-aachen.de> Date: Fri, 17 Aug 2018 05:09:42 -0700 Subject: [PATCH] Create simulator shell script #2 --- CMakeLists.txt | 4 ++++ {demos/brunel-simulation => brunel_example}/CMakeLists.txt | 3 ++- {demos/brunel-simulation => brunel_example}/brunel_example.py | 0 {demos/brunel-simulation => brunel_example}/nest_sim.py | 0 demos/CMakeLists.txt | 1 - 5 files changed, 6 insertions(+), 2 deletions(-) rename {demos/brunel-simulation => brunel_example}/CMakeLists.txt (84%) rename {demos/brunel-simulation => brunel_example}/brunel_example.py (100%) rename {demos/brunel-simulation => brunel_example}/nest_sim.py (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10bdba5..bb708ac 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 14ac85f..4bcfcfd 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 a121da6..e81ee7f 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) -- GitLab