Moved dohpblock to tools directory

jedbrown · Oct 24, 2009 · 52c9104 · 52c9104
1 parent 2f9a58f
commit 52c9104
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,8 @@ add_definitions (${PETSC_DEFINITIONS})
 
 option (dUSE_DEBUG         "Compile Dohp with extra debugging" ON)
 option (Dohp_BUILD_TESTS   "Build tests"                       ON)
-option (Dohp_BUILD_SANDBOX "Build programs in sandbox"         ON)
+option (Dohp_BUILD_TOOLS   "Build tools"                       ON)
+option (Dohp_BUILD_SANDBOX "Build programs in sandbox"         OFF)
 option (PEDANTIC_WARNINGS  "Compile with pedantic warnings"    ON)
 option (BUILD_SHARED_LIBS  "Build shared Dohp libraries"       ON)
 

diff --git a/sandbox/itaps/CMakeLists.txt b/sandbox/itaps/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Should only be included when Dohp_BUILD_SANDBOX
 
 set (Dohp_SANDBOX_EXECS
-  dohpblock)
+  )
 
 foreach (EXE ${Dohp_SANDBOX_EXECS})
   add_executable (${EXE} "${EXE}.c")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -47,3 +47,8 @@ if (Dohp_BUILD_TESTS)
   add_subdirectory (vec/tests)
   add_subdirectory (fs/tests)
 endif (Dohp_BUILD_TESTS)
+
+if (Dohp_BUILD_TOOLS)
+  add_subdirectory (tools)
+endif (Dohp_BUILD_TOOLS)
+
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Should only be included when Dohp_BUILD_TOOLS
+
+set (Dohp_TOOLS_EXECS
+  dohpblock)
+
+foreach (EXE ${Dohp_TOOLS_EXECS})
+  add_executable (${EXE} "${EXE}.c")
+  target_link_libraries (${EXE} dohp)
+endforeach (EXE)
+
+install (TARGETS ${Dohp_TOOLS_EXECS}
+  RUNTIME DESTINATION bin)
diff --git a/sandbox/itaps/dohpblock.c → src/tools/dohpblock.c b/sandbox/itaps/dohpblock.c → src/tools/dohpblock.c