diff --git a/CMakeLists.txt b/CMakeLists.txt index f69ee6367180fcf7e8f505aba4827c8c4315fcdc..2e75a7ede389d829a80f97d578a565de05cabecb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,6 +289,6 @@ endif() add_subdirectory(src) add_subdirectory(mechanisms) # after src path so that gpu_mechanism library is last on link line add_subdirectory(tests) -add_subdirectory(miniapp) +add_subdirectory(miniapps) add_subdirectory(lmorpho) add_subdirectory(doc) diff --git a/miniapps/CMakeLists.txt b/miniapps/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..7e0a828d7895e79fafa34a82285f0c023cc8d2ef --- /dev/null +++ b/miniapps/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(miniapp) diff --git a/miniapp/CMakeLists.txt b/miniapps/miniapp/CMakeLists.txt similarity index 88% rename from miniapp/CMakeLists.txt rename to miniapps/miniapp/CMakeLists.txt index 86d5f906c4c4ef38308c7205c47b780472a10967..85b25f7b3fe1dc03178dce4e8e7b304f9e21b629 100644 --- a/miniapp/CMakeLists.txt +++ b/miniapps/miniapp/CMakeLists.txt @@ -19,5 +19,5 @@ endif() set_target_properties( miniapp.exe PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/miniapp" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/miniapps/miniapp" ) diff --git a/miniapp/README.md b/miniapps/miniapp/README.md similarity index 100% rename from miniapp/README.md rename to miniapps/miniapp/README.md diff --git a/miniapp/io.cpp b/miniapps/miniapp/io.cpp similarity index 100% rename from miniapp/io.cpp rename to miniapps/miniapp/io.cpp diff --git a/miniapp/io.hpp b/miniapps/miniapp/io.hpp similarity index 100% rename from miniapp/io.hpp rename to miniapps/miniapp/io.hpp diff --git a/miniapp/miniapp.cpp b/miniapps/miniapp/miniapp.cpp similarity index 100% rename from miniapp/miniapp.cpp rename to miniapps/miniapp/miniapp.cpp diff --git a/miniapp/miniapp_recipes.cpp b/miniapps/miniapp/miniapp_recipes.cpp similarity index 100% rename from miniapp/miniapp_recipes.cpp rename to miniapps/miniapp/miniapp_recipes.cpp diff --git a/miniapp/miniapp_recipes.hpp b/miniapps/miniapp/miniapp_recipes.hpp similarity index 100% rename from miniapp/miniapp_recipes.hpp rename to miniapps/miniapp/miniapp_recipes.hpp diff --git a/miniapp/morphology_pool.cpp b/miniapps/miniapp/morphology_pool.cpp similarity index 100% rename from miniapp/morphology_pool.cpp rename to miniapps/miniapp/morphology_pool.cpp diff --git a/miniapp/morphology_pool.hpp b/miniapps/miniapp/morphology_pool.hpp similarity index 100% rename from miniapp/morphology_pool.hpp rename to miniapps/miniapp/morphology_pool.hpp diff --git a/miniapp/plot.py b/miniapps/miniapp/plot.py similarity index 100% rename from miniapp/plot.py rename to miniapps/miniapp/plot.py diff --git a/miniapp/trace.cpp b/miniapps/miniapp/trace.cpp similarity index 100% rename from miniapp/trace.cpp rename to miniapps/miniapp/trace.cpp diff --git a/miniapp/trace.hpp b/miniapps/miniapp/trace.hpp similarity index 100% rename from miniapp/trace.hpp rename to miniapps/miniapp/trace.hpp diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index 4ac2df17496c2a87a2756c89613fa553a9c6244b..799c4ef7497a5ebd287ac351d76d2dbe07cb676f 100755 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -60,6 +60,6 @@ ${launch} ./tests/global_communication.exe || error "running global communicatio progress "Miniapp spike comparison test" make miniapp.exe -j4 || error "building miniapp" -${launch} ./miniapp/miniapp.exe -n 20 -t 100 || error "running miniapp" +${launch} ./miniapps/miniapp/miniapp.exe -n 20 -t 100 || error "running miniapp" cd $base_path