Merge branch 'master' of github.com:BhallaLab/moose

.travis.yml

 language: cpp
-compiler: 
+compiler:
     - gcc os:
     - linux
     - osx
@@ -13,18 +13,23 @@ notifications:
     email:
         recipients:
             - dilawar.s.rajput@gmail.com
+            - bhalla@ncbs.res.in
+            - aviralg@ncbs.res.in
+            - hrani@ncbs.res.in
+            - ray.subhasis@gmail.com
+
         on_success: change
         on_failure: always
 
 env:
-    - CTEST_MODEL=Nightly 
+    - CTEST_MODEL=Nightly
 cache: apt
-before_script: 
+before_script:
     - sudo apt-get update -qq
-    - sudo apt-get install libxml2-dev libbz2-dev 
+    - sudo apt-get install libxml2-dev libbz2-dev
     - sudo apt-get install libhdf5-serial-dev
     - sudo apt-get install python-numpy python-setuptools python-networkx
-    - sudo apt-get install make texinfo cmake 
+    - sudo apt-get install make texinfo cmake
     - sudo apt-get install python-suds python-matplotlib
     - sudo apt-get install python-qt4-dev python-qt4-gl python-sip-dev libqt4-dev libopenscenegraph-dev
 
@@ -32,11 +37,11 @@ install:
     - wget ftp://ftp.gnu.org/gnu/gsl/gsl-1.16.tar.gz
     - tar -xzvf gsl-1.16.tar.gz
     - cd gsl-1.16 && ./configure --prefix=/usr && make && sudo make install && cd ..
-    - wget http://sourceforge.net/projects/sbml/files/libsbml/5.11.4/stable/libSBML-5.11.4-core-src.tar.gz
-    - tar -xzvf libSBML-5.11.4-core-src.tar.gz 
-    - cd libsbml-5.11.4 && ./configure --prefix=/usr --with-zlib --with-bzip2 --with-libxml && make && sudo make install && cd ..
-script: 
+    - wget http://sourceforge.net/projects/sbml/files/libsbml/5.9.0/stable/libSBML-5.9.0-core-src.tar.gz
+    - tar -xzvf libSBML-5.9.0-core-src.tar.gz
+    - cd libsbml-5.9.0 && ./configure --prefix=/usr --with-zlib --with-bzip2 --with-libxml && make && sudo make install && cd ..
+script:
     - mkdir -p _build && cd _build && cmake -DCMAKE_INSTALL_PREFIX=`pwd`/_install -DDEBUG=ON .. && make
 
 after_success:
-    - ctest --output-on-failure 
+    - ctest --output-on-failure

CMakeLists.txt

@@ -10,10 +10,15 @@ set(DATA_DIR ${CMAKE_SOURCE_DIR}/data)
 
 set(OUTPUT_MOOSEBIN ${MOOSE_CORE_BUILD_DIR}/moose.bin)
 set(OUTPUT_MOOSESDIST ${MOOSE_CORE_BUILD_DIR}/moose-${MOOSE_VERSION}.tar.gz)
+
+# Options to pass down to moose-core
+option(WITH_DOC "Build documentation" OFF)
+option(DEBUG "Build with DEBUG support" OFF)
 add_custom_command(OUTPUT ${OUTPUT_MOOSEBIN} ${OUTPUT_MOOSESDIST}
     COMMAND ${CMAKE_COMMAND} 
         -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-        -DDEBUG=OFF
+        -DDEBUG=${DEBUG}
+        -DWITH_DOC=${WITH_DOC}
         ${MOOSE_CORE_DIR}
     COMMAND $(MAKE)
     WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR}

README.md

@@ -15,6 +15,21 @@ moose from this repository.
     make 
     sudo make install
 
+## Fine tuning build process
+
+You can pass options to cmake from command line to fine-tune the build process.
+For example, by default, we don't build documentation. If you want to build
+documentation,
+
+    $ cmake -DWITH_DOC=ON ..
+    $ make
+
+Doing so, cmake will also build documentation (and later install it when `make
+install` is used). Building documentation requires `python-sphinx` and
+`doxygen`.  __TODO: Document cmake options__.
+
+# Uninstalling
+
 To uninstall moose, run the following command in the same directory where you ran
 previous `make install` command.
 

moose-core @ 21046e25

-Subproject commit 3e6bf56253d762737a0584bbf8b2fcd8cb1b5eb8
+Subproject commit 21046e25ca1a667fa095d492d396cd69101e7f14

moose-examples @ 8708ca45

-Subproject commit a839d4227d150497e3435f1d1dee7ce9cd175c01
+Subproject commit 8708ca45522c5c24ce3f1bb4c7419a3b3fac5f29