MSVC fixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 375ee33e1c7efc46c3b6e9a72f95610ea8cff6dd..b425ee1f488c430e264a4ee863d77af5396014b7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,8 +152,7 @@ ADD_SUBDIRECTORY(cmake/config) # has to be included after source
 ADD_SUBDIRECTORY(contrib) # has to be included after source
 ADD_SUBDIRECTORY(examples)
 
-# Do not automatically include the testsuite subproject on Windows.
-IF(DEAL_II_HAVE_TESTS_DIRECTORY AND NOT DEAL_II_MSVC)
+IF(DEAL_II_HAVE_TESTS_DIRECTORY)
   ADD_SUBDIRECTORY(tests)
 ENDIF()
 

diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index 1e1e54f780f42655a25126924484ccb7b9c49fb9..abe2993c30ca1c1b393f5606f3e7fb81352f5f27 100644 (file)
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -1936,7 +1936,7 @@ public:
    * functions below. It takes an iterator range and returns the sum of values.
    */
   template<typename T>
-  struct sum
+  struct CellWeightSum
   {
     typedef T result_type;
 
@@ -2063,7 +2063,7 @@ public:
      */
     boost::signals2::signal<unsigned int (const cell_iterator &,
                                           const CellStatus),
-                                                Triangulation<dim,spacedim>::sum<unsigned int> > cell_weight;
+                                                CellWeightSum<unsigned int> > cell_weight;
   };
 
   /**

diff --git a/include/deal.II/lac/relaxation_block.templates.h b/include/deal.II/lac/relaxation_block.templates.h
index 513f14b7b345e87e82ce234442cf4cb4e8a3e2f3..ce4174f01d2e33bdacc109a47aebf23550f8e9ff 100644 (file)
--- a/include/deal.II/lac/relaxation_block.templates.h
+++ b/include/deal.II/lac/relaxation_block.templates.h
@@ -43,7 +43,8 @@ std::size_t
 RelaxationBlock<MatrixType,inverse_type>::AdditionalData::memory_consumption() const
 {
   std::size_t result = sizeof(*this)
-                       + - sizeof(block_list) + block_list.memory_consumption();
+                       + block_list.memory_consumption()
+                       - sizeof(block_list);
   for (unsigned int i=0; i<order.size(); ++i)
     result += MemoryConsumption::memory_consumption(order[i]);
   return result;

diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake
index 007a62cbe8ec31c953d3f99c807670a1c1c52795..2696df385e8349a9116072861b1e89542c051d4b 100644 (file)
--- a/tests/run_testsuite.cmake
+++ b/tests/run_testsuite.cmake
@@ -480,10 +480,13 @@ IF("${_res}" STREQUAL "0")
 
     MESSAGE("-- Running setup_tests")
     EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND}
-      --build ${CTEST_BINARY_DIRECTORY} --target setup_tests
+      --build . --target setup_tests
       -- ${MAKEOPTS}
-      OUTPUT_QUIET RESULT_VARIABLE _res
+      WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}
+      OUTPUT_QUIET 
+      RESULT_VARIABLE _res
       )
+
     IF(NOT "${_res}" STREQUAL "0")
       MESSAGE(FATAL_ERROR "
 \"setup_tests\" target exited with an error. Bailing out.
@@ -492,6 +495,9 @@ IF("${_res}" STREQUAL "0")
     ENDIF()
 
     MESSAGE("-- Running CTEST_TESTS()")
+    IF(DEAL_II_MSVC)
+      SET(CTEST_BUILD_CONFIGURATION "${JOB_BUILD_CONFIGURATION}")
+    ENDIF()
     CTEST_TEST()
 
     IF(COVERAGE)