Resolved conflict

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")

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 )
@@ -57,8 +56,8 @@ if (CMAKE_CROSSCOMPILING)
     UNSET( yaml-cpp_DIR CACHE ) 
     UNSET( Eigen3_FOUND CACHE ) 
     UNSET( yaml-cpp_FOUND CACHE ) 
-    find_package (yaml-cpp 0.6 PATHS ${CMAKE_INSTALL_PREFIX} REQUIRED ) #QUIET )  # Serialisation of classes 
-    find_package (Eigen3 3.3 PATHS ${CMAKE_INSTALL_PREFIX} REQUIRED )   # QUIET)     # Matrix/Vector & Math
+    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

@@ -170,7 +170,6 @@ const char *buildString = __DATE__ ", " __TIME__;
 		EmEarth->AttachFieldPoints(receivers);
 		EmEarth->SetFieldsToCalculate(H);
         EmEarth->SetHankelTransformMethod(string2Enum<HANKELTRANSFORMTYPE>(config[0]));
-        EmEarth->SetHankelTransformMethod(FHTKEY201);
 
     ///////////////////////////////////////////////
 	// Keep track of time

Modules/FDEM1D/src/EMEarth1D.cpp

@@ -229,15 +229,10 @@ namespace Lemma {
         }
 
         if (Antenna->GetName() == std::string("PolygonalWireAntenna") || Antenna->GetName() == std::string("TEMTransmitter") ) {
-
             icalc += 1;
-
             // Check to see if they are all on a plane? If so we can do this fast
-            /* TODO FIX THIS ISSUES */
             if (Antenna->IsHorizontallyPlanar() && HankelType == ANDERSON801) {
-                //std::cout << "Lag baby lag" << std::endl;
                 for (int ifreq=0; ifreq<Antenna->GetNumberOfFrequencies();++ifreq) {
-                    //std::cout << "Num Recs" <<  Receivers->GetNumberOfPoints() << std::endl;
                     Real wavef = 2.*PI* Antenna->GetFrequency(ifreq);
                     #ifdef LEMMAUSEOMP
                     #pragma omp parallel
@@ -248,12 +243,10 @@ namespace Lemma {
                     #pragma omp for schedule(static, 1)
                     #endif
                     for (int irec=0; irec<Receivers->GetNumberOfPoints(); ++irec) {
-                    //for (int irec=0; irec<2; ++irec) { // TODO FIXME BELO
                         auto AntCopy = static_cast<PolygonalWireAntenna*>(Antenna.get())->ClonePA();
                         SolveLaggedTxRxPair(irec, Hankel.get(), wavef, ifreq, AntCopy.get());
-                        //exit(0);
                     }
-                    //Receivers->ClearFields(); // FIXME DEBUG TODO
+                    //Receivers->ClearFields();
                     #ifdef LEMMAUSEOMP
                     }
                     #endif