fixes for MSVC

- fix path in documentation
- remove friend declaration MSVC chokes on
- fix unittest scripts (line endings)
- whitelist MSVC 2015 update 1 in bundled boost
- fix run target in examples
- do not specify target "all"
- cmake --build can not have a relative directory on windows
- need to specify build configuration
- need to pass generator along
- disable CRT debug dialog box in tests

diff --git a/.gitattributes b/.gitattributes
index cda3807ce0d5cced8451a19fce4b40672bfe57ba..63bcff01134f2ab8e46ac9d067efb47400f67997 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,5 @@
 /tests/run_test.cmake -export-ignore
 .gitattributes export-ignore
 .travis.yml export-ignore
+/cmake/scripts/run_test.sh text eol=lf
+/tests/**/*output text eol=lf
\ No newline at end of file

diff --git a/bundled/boost-1.56.0/include/boost/config/compiler/visualc.hpp b/bundled/boost-1.56.0/include/boost/config/compiler/visualc.hpp
index 467172498a5cd18f6991db346e051bab326d915c..8765108a8a4c6275798aca20c12f37b26f5c7ec9 100644 (file)
--- a/bundled/boost-1.56.0/include/boost/config/compiler/visualc.hpp
+++ b/bundled/boost-1.56.0/include/boost/config/compiler/visualc.hpp
@@ -263,7 +263,8 @@
 
 //
 // last known and checked version is 18.00.20827.3 (VC12 RC, aka 2013 RC):
-#if (_MSC_VER > 1800 && _MSC_FULL_VER > 180020827)
+// tjhei: change 180020827 to 190023506 (vs 2015 update 1)
+#if (_MSC_VER > 1800 && _MSC_FULL_VER > 190023506)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else

diff --git a/cmake/macros/macro_deal_ii_invoke_autopilot.cmake b/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
index 594c6e6e8cc7a5f9a1b9db37c2ef75da44b00ecd..be2a39bd87f6d370e0cfc27656faabb3eedff73e 100644 (file)
--- a/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
+++ b/cmake/macros/macro_deal_ii_invoke_autopilot.cmake
@@ -76,7 +76,7 @@ MACRO(DEAL_II_INVOKE_AUTOPILOT)
     ENDIF()
     FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/run_target.cmake
       "SET(ENV{PATH} \"${CMAKE_CURRENT_BINARY_DIR}${_delim}${DEAL_II_PATH}/${DEAL_II_EXECUTABLE_RELDIR}${_delim}\$ENV{PATH}\")\n"
-      "EXECUTE_PROCESS(COMMAND ${TARGET_RUN}\n"
+      "EXECUTE_PROCESS(COMMAND ${CMAKE_BUILD_TYPE}\\\\${TARGET_RUN}\n"
       "  RESULT_VARIABLE _return_value\n"
       "  )\n"
       "IF(NOT \"\${_return_value}\" STREQUAL \"0\")\n"

diff --git a/cmake/scripts/normalize.pl b/cmake/scripts/normalize.pl
index 73b6ade2330a37bb28e7c98bece1458a4d631fa9..f2c33eb802eec2f03c9bc24e02fd39d08c1e04af 100644 (file)
--- a/cmake/scripts/normalize.pl
+++ b/cmake/scripts/normalize.pl
@@ -23,6 +23,9 @@
 #  small doubles
 #
 
+# Convert windows to unix line endings. This is necessary to be able to run
+# the testsuite on windows (using cygwin's diff/perl)
+s/\r$//;
 
 # Remove JobID
 

diff --git a/cmake/scripts/run_test.cmake b/cmake/scripts/run_test.cmake
index e4ab1e5cba8e9a8b7b45163d0c5343876950f91d..a95795e7e14c3477642319de301245066229872a 100644 (file)
--- a/cmake/scripts/run_test.cmake
+++ b/cmake/scripts/run_test.cmake
@@ -53,7 +53,8 @@ IF("${EXPECT}" STREQUAL "")
 ENDIF()
 
 EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND}
-  --build ${BINARY_DIR} --target ${TRGT}
+  --build . --target ${TRGT}
+  WORKING_DIRECTORY ${BINARY_DIR}
   RESULT_VARIABLE _result_code # ignored ;-)
   OUTPUT_VARIABLE _output
   )

diff --git a/cmake/scripts/run_test.sh b/cmake/scripts/run_test.sh
index 3f652a4a963ef9e5acbfe680691e68cc3e3b6b62..897e4ca7b2a5a2b40952c2a8755152fc0e877a6f 100644 (file)
--- a/cmake/scripts/run_test.sh
+++ b/cmake/scripts/run_test.sh
@@ -87,7 +87,7 @@ diff() {
     # is found (including the main comparison file).
     #
     case ${NUMDIFF_EXECUTABLE} in
-      *numdiff)
+      *numdiff*)
         ${NUMDIFF_EXECUTABLE} -a 1e-6 -r 1e-8 -s ' \t\n:<>=,;' \
                               "${file}" output > diff${variant}
         ;;

diff --git a/doc/developers/testsuite.html b/doc/developers/testsuite.html
index 0f45a883732241993f7888a7383e320627218775..d34da0baa7a8a5072b772969a0353c0879a2fd02 100644 (file)
--- a/doc/developers/testsuite.html
+++ b/doc/developers/testsuite.html
@@ -818,7 +818,7 @@ MAKEOPTS
 <pre>
 mkdir dealii/build
 cd dealii/build
-ctest -j4 -S ../cmake/scripts/run_buildtest.cmake
+ctest -j4 -S ../tests/run_buildtest.cmake
 </pre>
     </p>
 

diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h
index 85b1451ec83321a41cb81bd23006937799030b85..6f94d21e510908a296836c0a8f85363204d5d82a 100644 (file)
--- a/include/deal.II/lac/sparse_matrix.h
+++ b/include/deal.II/lac/sparse_matrix.h
@@ -1602,7 +1602,12 @@ private:
   template <typename,bool> friend class SparseMatrixIterators::Iterator;
   template <typename,bool> friend class SparseMatrixIterators::Accessor;
 
+#ifndef DEAL_II_MSVC
+  // Visual studio is choking on the following friend declaration, probably
+  // because Reference is only defined in a specialization. It looks like
+  // the library is compiling without this line, though.
   template <typename number2> friend class SparseMatrixIterators::Accessor<number2, false>::Reference;
+#endif
 };
 
 #ifndef DOXYGEN

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index e2fb2b1835441dafa1986b1a3d2db0d57bf929e3..c37b0e732b36fb7706d0fa4913bcadcd26fe88c4 100644 (file)
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -82,6 +82,30 @@ FOREACH(build ${DEAL_II_BUILD_TYPES})
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DEAL_II_EXECUTABLE_RELDIR}"
     )
 
+  # Under Windows (MSVC) cmake will always generate multi-configuration
+  # projects. When building on the command line with 'cmake --build .',
+  # release and debug builds of the library are done with the default 'Debug'
+  # configuration. This causes the debug and release .lib to be built inside
+  # ./lib/Debug/. This is not very pretty and confuses example/test projects,
+  # so we just hard-wire the location here. We only really need to set static
+  # lib locations for _DEBUG (no support for dynamic linking, _RELEASE will be
+  # ignored), but we do it anyhow.
+  IF (DEAL_II_MSVC)
+    SET_PROPERTY(TARGET ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX} PROPERTY
+      LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${DEAL_II_LIBRARY_RELDIR}"
+      )
+    SET_PROPERTY(TARGET ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX} PROPERTY
+      ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${DEAL_II_LIBRARY_RELDIR}"
+      )
+    SET_PROPERTY(TARGET ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX} PROPERTY
+      LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${DEAL_II_LIBRARY_RELDIR}"
+      )
+    SET_PROPERTY(TARGET ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX} PROPERTY
+      ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${DEAL_II_LIBRARY_RELDIR}"
+      )
+  ENDIF()
+
+
   TARGET_LINK_LIBRARIES(${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}
     ${DEAL_II_LIBRARIES_${build}}
     ${DEAL_II_LIBRARIES}

diff --git a/tests/build_tests/CMakeLists.txt b/tests/build_tests/CMakeLists.txt
index 512ceea08d3476b807e5de9ddd2614228c83ed43..3928e157f176891547e1ee38052ad43c1ad92816 100644 (file)
--- a/tests/build_tests/CMakeLists.txt
+++ b/tests/build_tests/CMakeLists.txt
@@ -117,7 +117,7 @@ FOREACH(_step_full ${_steps})
       ADD_CUSTOM_COMMAND(OUTPUT ${_step_dir}/configure_output
         COMMAND rm -f ${_step_dir}/failing_configure_output
         COMMAND ${CMAKE_COMMAND}
-          -DDEAL_II_DIR=${DEAL_II_DIR} -DCMAKE_BUILD_TYPE=${_build} .
+          -DDEAL_II_DIR=${DEAL_II_DIR} -DCMAKE_BUILD_TYPE=${_build} -G ${CMAKE_GENERATOR} .
           > ${_step_dir}/configure_output 2>&1
           || (mv ${_step_dir}/configure_output
                  ${_step_dir}/failing_configure_output
@@ -128,11 +128,21 @@ FOREACH(_step_full ${_steps})
           ${DEAL_II_PATH}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PACKAGE_NAME}Config.cmake
         )
 
+
+      # MSVC needs to know if we are compiling the debug or release configuration right now:
+      IF(MSVC AND ("${_build}" STREQUAL "RELEASE"))
+        SET(_magic1 "--config")
+        SET(_magic2 "Release")
+      ELSE()
+        SET(_magic1 "")
+        SET(_magic2 "")
+      ENDIF()
+
       # And a rule on how to build the example step:
       ADD_CUSTOM_COMMAND(OUTPUT ${_step_dir}/build_output
         COMMAND test ! -f ${_step_dir}/configure_output
           || (rm -f ${_step_dir}/failing_build_output
-              && ${CMAKE_COMMAND} --build ${_step_dir} --target all
+              && ${CMAKE_COMMAND} --build . ${_magic1} ${_magic2}
               > ${_step_dir}/build_output 2>&1)
           || (mv ${_step_dir}/build_output
                  ${_step_dir}/failing_build_output
@@ -152,7 +162,7 @@ FOREACH(_step_full ${_steps})
       ADD_CUSTOM_COMMAND(OUTPUT ${_step_dir}/run_output
         COMMAND test ! -f ${_step_dir}/build_output
           || (rm -f ${_step_dir}/failing_run_output
-             && ${CMAKE_COMMAND} --build ${_step_dir} --target run
+             && ${CMAKE_COMMAND} --build .  --target run ${_magic1} ${_magic2}
              > ${_step_dir}/run_output 2>&1)
           || (mv ${_step_dir}/run_output
                  ${_step_dir}/failing_run_output

diff --git a/tests/tests.h b/tests/tests.h
index d410715be9af33c6b4e324b11187785682197f36..6d8846bcf58528deb9d4eca09f9d58fe98a3ce44 100644 (file)
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -43,6 +43,20 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #endif
 
 
+#ifdef DEAL_II_MSVC
+// Under windows tests will hang and show a debugging dialog box from the
+// debug CRT if an exception is encountered. Disable this:
+#include <stdlib.h>
+
+struct DisableWindowsDebugRuntimeDialog
+{
+  DisableWindowsDebugRuntimeDialog ()
+  {
+    _set_abort_behavior( 0, _WRITE_ABORT_MSG);
+  }
+} deal_II_windows_crt_dialog;
+#endif
+
 // implicitly use the deal.II namespace everywhere, without us having to say
 // so in each and every testcase
 using namespace dealii;