Skip to content
Snippets Groups Projects
Commit f94f0eab authored by Ben Cumming's avatar Ben Cumming Committed by Sam Yates
Browse files

Move miniapps path to 'example/' (#423)

* Rename `miniapps` subdirectory to `example`.
* Have all example executables be built under `example` in the build directory.
* Update Travis CI to run miniapp from new path.
parent a80df6fa
No related branches found
No related tags found
No related merge requests found
......@@ -193,7 +193,7 @@ endif()
#----------------------------------------------------------
# Built-in profiler
#----------------------------------------------------------
option(ARB_WITH_PROFILING "use built-in profiling of miniapp" OFF)
option(ARB_WITH_PROFILING "use built-in profiling" OFF)
if(ARB_WITH_PROFILING)
add_definitions(-DARB_HAVE_PROFILING)
endif()
......@@ -266,7 +266,6 @@ include_directories(
"${PROJECT_SOURCE_DIR}/tclap"
"${PROJECT_SOURCE_DIR}/include"
"${PROJECT_SOURCE_DIR}/src"
"${PROJECT_SOURCE_DIR}/miniapp"
"${PROJECT_SOURCE_DIR}/modcc"
"${PROJECT_SOURCE_DIR}")
if(EXTERNAL_INCLUDES)
......@@ -289,6 +288,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(miniapps)
add_subdirectory(example)
add_subdirectory(lmorpho)
add_subdirectory(doc)
File moved
......@@ -19,5 +19,5 @@ endif()
set_target_properties(
miniapp.exe
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/miniapps/miniapp"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/example"
)
File moved
File moved
File moved
File moved
File moved
File moved
File moved
......@@ -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} ./miniapps/miniapp/miniapp.exe -n 20 -t 100 || error "running miniapp"
${launch} ./example/miniapp.exe -n 20 -t 100 || error "running miniapp"
cd $base_path
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment