Merge branch 'enhancement_3' of https://git.lemmasoftware.org/Lemma into enhancement_3

CMakeLists.txt

@@ -70,7 +70,8 @@ ExternalProject_Add(YAML-CPP
 	UPDATE_COMMAND ""
 	PATCH_COMMAND ""
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/yaml-cpp
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} /
+		-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
 )
 add_compile_options(-DHAVE_YAMLCPP) 
 
@@ -165,11 +166,14 @@ endif()
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG(-std=c++14 COMPILER_SUPPORTS_CXX14)
 CHECK_CXX_COMPILER_FLAG(-std=c++11 COMPILER_SUPPORTS_CXX11)
+CHECK_CXX_COMPILER_FLAG(-std=c++0x COMPILER_SUPPORTS_CXX0X)
 
 if(COMPILER_SUPPORTS_CXX14)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 elseif(COMPILER_SUPPORTS_CXX11)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+elseif(COMPILER_SUPPORTS_CXX0X)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 else()
 	message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 or C++14 support. Please use a different C++ compiler.")
 endif()

LemmaCore/include/LemmaObject.h

@@ -57,7 +57,10 @@ class LemmaObject {
 
         // ====================  INQUIRY       ==============================
 
-        /** Returns the name of the underlying class, similiar to Python's type */
+        /** Returns the name of the underlying class; Run-time type information (RTTI). This approach
+            Was chosen over typeid due to name mangling among various compilers, and the need for consistency
+            in Serialized objects.
+         */
         virtual inline std::string GetName() const {
             return this->CName;
         }

LemmaCore/src/LayeredEarth.cpp

@@ -17,16 +17,6 @@ namespace Lemma {
 
 	// ====================    FRIENDS     ======================
 
-    /*
-	std::ostream &operator<<(std::ostream &stream,
-				const LayeredEarth &ob) {
-		stream << *(EarthModel*)(&ob);
-  		//stream << "Class Name : "<< ob.Name  << "\n";
-  		stream << "Number of Layers "<< ob.NumberOfLayers  << "\n";
-  		return stream;
-	}
-    */
-
     std::ostream &operator << (std::ostream &stream, const LayeredEarth &ob) {
         stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
         return stream;

Modules/FDEM1D/CMakeLists.txt

@@ -5,6 +5,11 @@ add_subdirectory("src")
 
 add_library( fdem1d ${FEM1DSOURCE} )  
 target_link_libraries(fdem1d "lemmacore")
+set_target_properties(fdem1d PROPERTIES 
+	VERSION  "${LEMMA_VERSION}"
+	SOVERSION "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}"
+	PROJECT_LABEL "Lemma ${LABEL_SUFFIX}"
+)
 
 install ( TARGETS fdem1d DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
 

Modules/FDEM1D/include/LayeredEarthEM.h

@@ -232,6 +232,11 @@ namespace Lemma {
              */
             VectorXr GetLayerBreathPermitivity( );
 
+            /** Returns the name of the underlying class, similiar to Python's type */
+            virtual inline std::string GetName() const {
+                return CName;
+            }
+
         protected:
 
             // ====================  LIFECYCLE     ===========================