Merge pull request #6 from jmikeowen/blt-cmake-overhall

BLT/CMAKE build system

.gitignore

@@ -26,8 +26,13 @@ err.job
 runit
 dumps*
 src/BUILD
+src/build
 src/BUILD/**
+src/build/**
 dumps-*
+tpl
+tpl/**
+python
 
 # These are files automatically generated in our configure process.
 src/aclocal.m4

.gitmodules

@@ -0,0 +1,4 @@
+
+[submodule "blt"]
+	path = cmake/blt
+	url = https://github.com/llnl/blt

cmake/CMakeBasics.cmake

@@ -3,19 +3,14 @@
 ###############################################################################
 # Basic
 
-# Libraries
-include(cmake/SetupLibraries.cmake)
-
-find_package(PythonInterp)
-
 # Instantiate and add source files to the project
 # _inst_var   : *name* of list variable containing base names to instantiate
 #               The file ${_inst_var}Inst.cc.py must exist.
 #               If instantiation is disabled, ${_inst_var}.cc will be added
 #               to the source files, if it exists.
 # _source_var : *name* of list variable to append source files to.
 function(instantiate _inst_var _source_var)
-  set(_dims)
+  set(_dims 1)
   if(ENABLE_2D)
      list(APPEND _dims 2)
   endif()
@@ -28,9 +23,9 @@ function(instantiate _inst_var _source_var)
      if(ENABLE_INSTANTIATIONS)
         foreach(_dim ${_dims})
            set(_inst_py ${CMAKE_CURRENT_SOURCE_DIR}/${_inst}Inst.cc.py)
-           set(_inst_file ${_inst}Inst.cc.${_dim}.cc)
+           set(_inst_file ${_inst}Inst${_dim}d.cc)
            # Run the python script to generate the instantiation files
-           execute_process(COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/helpers/InstantiationGenerator.py
+           execute_process(COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/helpers/InstantiationGenerator.py
                                        ${_inst_py} ${_inst_file} ${_dim}
                            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -58,18 +53,23 @@ else()
     add_definitions("-DDEBUG=0")
 endif()
 
-add_definitions(-DCXXONLY=1)
+if(ENABLE_CXXONLY)
+  add_definitions(-DCXXONLY=1)
+endif()
 add_definitions(-DUSE_TETGEN=0)
 add_definitions(-DUSE_TRIANGLE=0)
 add_definitions(-DNOPOLYTOPE=1)
+add_definitions(-DSPHERAL1D=1)
 if(ENABLE_2D)
   add_definitions(-DSPHERAL2D=1)
 endif()
 if(ENABLE_3D)
   add_definitions(-DNOR3D=1)
   add_definitions(-DSPHERAL3D=1)
 endif()
-add_definitions(-DTIMER=1)
+if(ENABLE_TIMER)
+  add_definitions(-DTIMER=1)
+endif()
 
 if (ENABLE_MPI)
     add_definitions(-DUSE_MPI=1)