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

CMake/Mingw-Cross.cmake

@@ -37,4 +37,4 @@ set( CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "" )
 #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
 #Static Libs
 #Set Linker flags
-set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")

CMake/SuperBuild.cmake

@@ -15,9 +15,9 @@ else()
 		#INSTALL_COMMAND     ""
     )
 
-    message("Source dir of myExtProj = ${SOURCE_DIR}")   
-    ExternalProject_Get_property(EIGEN SOURCE_DIR)
-    message("Source dir of myExtProj = ${SOURCE_DIR}")   
+    #message("Source dir of myExtProj = ${SOURCE_DIR}")   
+    #ExternalProject_Get_property(EIGEN SOURCE_DIR)
+    #message("Source dir of myExtProj = ${SOURCE_DIR}")   
  
     # Are these necessary?
     #include_directories ("${CMAKE_INSTALL_PREFIX}/include/eigen3/")

CMakeLists.txt

@@ -22,13 +22,12 @@ set(LEMMA_VERSION_NOQUOTES "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMM
 ########################################
 
 ## Options--what do you want to do
-
 option ( BUILD_SHARED_LIBS      "Shared or static libraries"  OFF )
-set(CMAKE_BUILD_TYPE "Release" STRING
-       "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel."
-       FORCE cache)
-set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel )
- 
+
+IF( NOT CMAKE_BUILD_TYPE )
+   SET( CMAKE_BUILD_TYPE Release ... FORCE )
+ENDIF()
+
 option ( LEMMA_ENABLE_TESTING       "Turn on unit testing" OFF )
 option ( LEMMA_BUILD_EXAMPLES       "Compile example Lemma applications" OFF )
 option ( LEMMA_USE_OPENMP           "Use OpenMP in Lemma" OFF )
@@ -45,14 +44,20 @@ option (LEMMA_VTK8_SUPPORT "VTK 8.x library for visualisation and grids" OFF)
 ########################################################################################## 
 if (CMAKE_CROSSCOMPILING)
     message ( STATUS "Cross-compiling! Only searching in install directory for components." )
+    # Kind of hack-ish, CMake doesn't always find this. It's buried in Cross compilation, so, 
+    # hopefully anyone doing this can problem solve. 
+    SET( CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/CMake ${CMAKE_INSTALL_PREFIX}/share/eigen3 )
+    #SET( CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX} )
     SET( CMAKE_FIND_ROOT_PATH ONLY ${CMAKE_INSTALL_PREFIX})
     SET( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY ) 
     SET( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  ONLY ) 
     SET( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE  ONLY )
     UNSET( Eigen3_DIR CACHE ) 
     UNSET( yaml-cpp_DIR CACHE ) 
-    find_package (Eigen3 3.3 )# QUIET)     # Matrix/Vector & Math
-    find_package (yaml-cpp 0.6 ) #QUIET )  # Serialisation of classes 
+    UNSET( Eigen3_FOUND CACHE ) 
+    UNSET( yaml-cpp_FOUND CACHE ) 
+    find_package (yaml-cpp 0.6 PATHS ${CMAKE_INSTALL_PREFIX} ) #QUIET )  # Serialisation of classes 
+    find_package (Eigen3 3.3 PATHS ${CMAKE_INSTALL_PREFIX}  )   # QUIET)     # Matrix/Vector & Math
 endif()
 
 find_package (Eigen3 3.3 QUIET)     # Matrix/Vector & Math

Modules/FDEM1D/examples/Hantenna.cpp

@@ -27,6 +27,26 @@
 #include "FDEM1D"
 #include "timer.h"
 
+#if defined(__clang__)
+	/* Clang/LLVM. ---------------------------------------------- */
+    const char* compiler = "clang";
+#elif defined(__ICC) || defined(__INTEL_COMPILER)
+	/* Intel ICC/ICPC. ------------------------------------------ */
+    const char* compiler = "icpc";
+
+#elif defined(__GNUC__) || defined(__GNUG__)
+	/* GNU GCC/G++. --------------------------------------------- */
+    const char* compiler = "gcc (GCC) "  __VERSION__;
+
+#elif defined(_MSC_VER)
+	/* Microsoft Visual Studio. --------------------------------- */
+    const char* compiler = "msvc " _MSC_FULL_VER;
+
+#elif defined(__PGI)
+	/* Portland Group PGCC/PGCPP. ------------------------------- */
+    const char* compiler = "pgc";
+#endif
+
 using namespace Lemma;
 
 std::vector<Real>  readinpfile(const std::string& fname);
@@ -35,24 +55,20 @@ std::vector<std::string>  readinpfile2(const std::string& fname);
 
 int main(int argc, char** argv) {
 
-    std::cout <<
-    "\n"
-    << "Hantenna \n\n"
-    << "Hantenna is a programme for computing the H field from polygonal wire\n"
-    << "loop sources \n\n"
-    << "Hantenna was built using Lemma (Lemma is an Electromagnetics Modelling API)\n"
-    << "Lemma is Free and Open Source Software (FOSS) and is released under\n"
-    << "the MPL, it is covered by the following copyrights:\n"
-    << "Copyright (C) 2009, 2010, 2011, 2012, 218      Trevor P. Irons\n"
-    << "Copyright (C) 2011, 2012                       M. Andy Kass\n\n"
+const char *buildString = __DATE__ ", " __TIME__;
+    std::cout
+    << "===========================================================================\n"
+    << "Lemma " << LEMMA_VERSION << "\n"
+    << "[" << compiler << " " <<  buildString << "]\n"
+    << "This program is part of Lemma, a geophysical modelling and inversion API. \n"
+    << "     This Source Code Form is subject to the terms of the Mozilla Public\n"
+    << "     License, v. 2.0. If a copy of the MPL was not distributed with this\n"
+    << "     file, You can obtain one at http://mozilla.org/MPL/2.0/. \n"
+    << "Copyright (C) 2018 Lemma Software \n"
     << "More information may be found at: https://lemmasoftware.org\n"
-    << "                                     info@lemmasoftware.org\n\n"
-    << "=====================================================================\n"
-    << "This programme is part of Lemma, a geophysical modelling and inversion API \n"
-    << "This Source Code Form is subject to the terms of the Mozilla Public\n"
-    << "License, v. 2.0. If a copy of the MPL was not distributed with this\n"
-    << "file, You can obtain one at http://mozilla.org/MPL/2.0/. \n"
-    << "=====================================================================\n\n\n";
+    << "                                     info@lemmasoftware.org\n"
+    << "===========================================================================\n\n"
+    << "Hantenna calculates the harmonic H field from polygonal wire loop sources\n";
 
     if (argc < 5) {
         std::cout << "usage: hantenna.exe  trans.inp cond.inp points.inp config.inp \n";