Merge branch 'master' into master

Author: dilawar

CMakeLists.txt

@@ -66,15 +66,6 @@ add_custom_target(uninstall
 # This is for testing purpose.
 link_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-################################# OS Specific ##################################
-message(STATUS "Operating system: ${CMAKE_SYSTEM_NAME}")
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    CMAKE_POLICY(SET CMP0042 NEW)
-    set(MACOSX TRUE)
-else()
-    set(MACOSX FALSE)
-endif()
-
 ################################ CMAKE OPTIONS ##################################
 option(WITH_NSDF            "Enable NSDF support. Requires hdf5" OFF )
 

CheckCXXCompiler.cmake

@@ -1,5 +1,8 @@
-########################### COMPILER MACROS #####################################
+if(COMPILER_IS_TESTED)
+    return()
+endif()
 
+########################### COMPILER MACROS #####################################
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG( "-std=c++11" COMPILER_SUPPORTS_CXX11 )
 CHECK_CXX_COMPILER_FLAG( "-std=c++0x" COMPILER_SUPPORTS_CXX0X )
@@ -34,12 +37,11 @@ if(COMPILER_SUPPORT_UNUSED_BUT_SET_VARIABLE_NO_WARN)
 endif(COMPILER_SUPPORT_UNUSED_BUT_SET_VARIABLE_NO_WARN)
 
 if(COMPILER_SUPPORTS_CXX11)
-    message(STATUS "Your compiler supports c++11 features. Enabling it")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     add_definitions( -DENABLE_CPP11 )
     if(APPLE)
         #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++" )
-        message(STATUS "NOTE: Making clang to inline more aggresively" )
+        # message(STATUS "NOTE: Making clang to inline more aggresively" )
         add_definitions( -mllvm -inline-threshold=1000 )
     endif(APPLE)
 else(COMPILER_SUPPORTS_CXX11)
@@ -50,4 +52,4 @@ else(COMPILER_SUPPORTS_CXX11)
         ")
 endif(COMPILER_SUPPORTS_CXX11)
 
-
+set(COMPILER_IS_TESTED ON)

basecode/Cinfo.cpp

@@ -202,14 +202,6 @@ const Cinfo* Cinfo::find( const string& name )
 	map<string, Cinfo*>::iterator i = cinfoMap().find(name);
 	if ( i != cinfoMap().end() )
 		return i->second;
-
-#ifdef  RESULT_CHECK
-        stringstream ss;
-        ss << "+ " << name << " not found. Available names are " << endl;
-        ss << mapToString<string, Cinfo*>( cinfoMap() );
-        dump(ss.str(), "DEBUG");
-#endif     /* -----  not RESULT_CHECK  ----- */
-
 	return 0;
 }
 

basecode/Eref.h

@@ -10,19 +10,6 @@
 #ifndef _EREF_H
 #define _EREF_H
 
-#ifdef  CYMOOSE
-
-#include <iostream>
-#include <vector>
-using namespace std;
-
-class Element;
-class Id;
-class ObjId;
-class MsgDigest;
-
-#endif     /* -----  CYMOOSE  ----- */
-
 class Eref
 {
 public:

basecode/SrcFinfo.h

@@ -9,13 +9,6 @@
 #ifndef _SRC_FINFO_H
 #define _SRC_FINFO_H
 
-#ifdef  CYMOOSE
-
-#include "../basecode/Finfo.h"
-#include "../basecode/header.h"
-
-#endif     /* -----  CYMOOSE  ----- */
-
 /**
  * This set of classes define Message Sources. Their main job is to supply
  * a type-safe send operation, and to provide typechecking for it.

basecode/main.cpp

@@ -10,18 +10,10 @@
 #include "header.h"
 #include "SparseMatrix.h"
 
-#ifndef WIN32
-#include <sys/time.h>
-#else
 #include <time.h>
-#endif
 #include <math.h>
 #include <queue>
-#ifdef WIN32
-#include "../external/xgetopt/XGetopt.h"
-#else
 #include <unistd.h> // for getopt
-#endif
 #include "../scheduling/Clock.h"
 #include "../msg/DiagonalMsg.h"
 #include "../msg/SparseMsg.h"
@@ -93,12 +85,6 @@ extern void mooseBenchmarks( unsigned int option );
 unsigned int getNumCores()
 {
     unsigned int numCPU = 0;
-#ifdef WIN_32
-    SYSTEM_INFO sysinfo;
-    GetSystemInfo( &sysinfo );
-
-    numCPU = sysinfo.dwNumberOfProcessors;
-#endif
 
 #ifdef LINUX
     numCPU = sysconf( _SC_NPROCESSORS_ONLN );

benchmarks/CMakeLists.txt

@@ -1,5 +1,7 @@
-include_directories(../msg)
-include_directories(../basecode)
+cmake_minimum_required(VERSION 2.8)
+
+include( ${CMAKE_CURRENT_SOURCE_DIR}/../CheckCXXCompiler.cmake )
+
 add_library(benchmarks
     benchmarks.cpp
     kineticMarks.cpp

benchmarks/kineticMarks.cpp

@@ -7,7 +7,7 @@
 ** See the file COPYING.LIB for the full notice.
 **********************************************************************/
 
-#include "header.h"
+#include "../basecode/header.h"
 #include "../shell/Shell.h"
 
 /// Small model, long runtime.

biophysics/CMakeLists.txt

@@ -1,53 +1,53 @@
-include_directories(../basecode ../synapse ../utility ../)
-include_directories(../external/muparser/include)
+cmake_minimum_required(VERSION 2.8)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../CheckCXXCompiler.cmake)
 
 if(WITH_GSL)
     include_directories(${GSL_INCLUDE_DIRS})
 endif(WITH_GSL)
 
 set(BIOPHYSICS_SRCS
-	IntFire.cpp
-	SpikeGen.cpp
-        RandSpike.cpp
-	CompartmentDataHolder.cpp
-	CompartmentBase.cpp
-	Compartment.cpp
-	SymCompartment.cpp
-        GapJunction.cpp
-	ChanBase.cpp
-        ChanCommon.cpp
-	HHChannel.cpp
-        HHChannelBase.cpp
-        HHChannel2D.cpp
-	HHGate.cpp
-	HHGate2D.cpp
-	HHChannel2D.cpp
-        CaConcBase.cpp
-	CaConc.cpp
-	MgBlock.cpp
-        Nernst.cpp
-	Neuron.cpp
-	ReadCell.cpp
-        SwcSegment.cpp
-        ReadSwc.cpp
-	SynChan.cpp
-        NMDAChan.cpp
-	testBiophysics.cpp
-	IzhikevichNrn.cpp
-	DifShellBase.cpp
-	DifShell.cpp
-	DifBufferBase.cpp
-	DifBuffer.cpp
-	MMPump.cpp
-	Leakage.cpp
-	VectorTable.cpp
-	MarkovRateTable.cpp
-	MarkovChannel.cpp
-	MatrixOps.cpp
-	MarkovSolverBase.cpp
-	MarkovSolver.cpp
-	VClamp.cpp
-        Spine.cpp
+    IntFire.cpp
+    SpikeGen.cpp
+    RandSpike.cpp
+    CompartmentDataHolder.cpp
+    CompartmentBase.cpp
+    Compartment.cpp
+    SymCompartment.cpp
+    GapJunction.cpp
+    ChanBase.cpp
+    ChanCommon.cpp
+    HHChannel.cpp
+    HHChannelBase.cpp
+    HHChannel2D.cpp
+    HHGate.cpp
+    HHGate2D.cpp
+    HHChannel2D.cpp
+    CaConcBase.cpp
+    CaConc.cpp
+    MgBlock.cpp
+    Nernst.cpp
+    Neuron.cpp
+    ReadCell.cpp
+    SwcSegment.cpp
+    ReadSwc.cpp
+    SynChan.cpp
+    NMDAChan.cpp
+    testBiophysics.cpp
+    IzhikevichNrn.cpp
+    DifShellBase.cpp
+    DifShell.cpp
+    DifBufferBase.cpp
+    DifBuffer.cpp
+    MMPump.cpp
+    Leakage.cpp
+    VectorTable.cpp
+    MarkovRateTable.cpp
+    MarkovChannel.cpp
+    MatrixOps.cpp
+    MarkovSolverBase.cpp
+    MarkovSolver.cpp
+    VClamp.cpp
+    Spine.cpp
     )
 
 if(WITH_GSL)

biophysics/CaConc.cpp

@@ -7,8 +7,7 @@
 ** See the file COPYING.LIB for the full notice.
 **********************************************************************/
 
-// #include <cfloat>
-#include "header.h"
+#include "../basecode/header.h"
 #include "CaConcBase.h"
 #include "CaConc.h"