Merge pull request #1590 from bilke/win-fixes

Some Windows fixes

MaterialLib/SolidModels/Ehlers.h

@@ -164,10 +164,8 @@ public:
         {
             os << "State:\n"
                << "eps_p_D: " << m.eps_p_D << "\n"
-               << "e_p: " << m.e_p << "\n"
                << "eps_p_eff: " << m.eps_p_eff << "\n"
                << "eps_p_D_prev: " << m.eps_p_D_prev << "\n"
-               << "e_p_prev: " << m.e_p_prev << "\n"
                << "eps_p_eff_prev: " << m.eps_p_eff_prev << "\n"
                << "lambda: " << m.lambda << "\n";
             return os;

Tests/CMakeLists.txt

@@ -90,6 +90,7 @@ set(TESTRUNNER_ADDITIONAL_ARGUMENTS ${TESTRUNNER_ADDITIONAL_ARGUMENTS}
     --gtest_output=xml:./testrunner.xml)
 
 add_custom_target(tests-cleanup ${CMAKE_COMMAND} -E remove testrunner.xml)
+set_target_properties(tests-cleanup PROPERTIES FOLDER Testing)
 
 if(OGS_USE_PETSC)
     set(TEST_FILTER_MPI --gtest_filter=-MPITest_Math.*)
@@ -101,6 +102,7 @@ if(OGS_USE_PETSC)
         mpirun -np 3 $<TARGET_FILE:testrunner> --gtest_filter=MPITest*
         DEPENDS testrunner
     )
+    set_target_properties(tests_mpi PROPERTIES FOLDER Testing)
 else()
     add_custom_target(tests
         $<TARGET_FILE:testrunner> ${TESTRUNNER_ADDITIONAL_ARGUMENTS}
@@ -108,5 +110,7 @@ else()
     )
 endif()
 
+set_target_properties(tests PROPERTIES FOLDER Testing)
+
 # Creates one ctest entry for every googletest
 #ADD_GOOGLE_TESTS ( ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/testrunner ${TEST_SOURCES})

scripts/cmake/Find.cmake

@@ -21,6 +21,14 @@ find_package(cppcheck QUIET)
 
 find_package(PythonInterp QUIET)
 
+# Check for cmder git installed via chocolatey
+find_program(GIT_EXECUTABLE
+  NAMES git
+  PATHS C:/tools/cmder/vendor/git-for-windows
+  PATH_SUFFIXES cmd bin
+  DOC "Git command line client"
+)
+
 find_package(Git REQUIRED)
 string(REPLACE "mingw64/" "" GIT_EXECUTABLE ${GIT_EXECUTABLE}) # Windows git submodule fix
 set(GIT_TOOL_PATH ${GIT_EXECUTABLE} CACHE FILEPATH "The git command line interface" FORCE)