Changed order of includes, added /bigobj compilation flag, re gentryx#49

seb-ehm · Nov 1, 2017 · 904b45e · 904b45e
1 parent 8bcd1a4
commit 904b45e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/testbed/spmvmtests/CMakeLists.txt b/src/testbed/spmvmtests/CMakeLists.txt
@@ -5,6 +5,9 @@ include(auto.cmake)
 
 if(WITH_CPP14 AND WITH_INTRINSICS)
   add_executable(libgeodecomp_testbed_spmvmtests main.cpp mmio.cpp)
+  if(MSVC)
+  set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS /bigobj)
+  endif()
   set_target_properties(libgeodecomp_testbed_spmvmtests PROPERTIES OUTPUT_NAME spmvmtests)
   target_link_libraries(libgeodecomp_testbed_spmvmtests ${LOCAL_LIBGEODECOMP_LINK_LIB})
 endif()
diff --git a/src/testbed/spmvmtests/main.cpp b/src/testbed/spmvmtests/main.cpp
@@ -11,24 +11,25 @@
  * http://math.nist.gov/MatrixMarket/mmio-c.html
  *
  */
+
+#include <libflatarray/testbed/evaluate.hpp>
+#include <libflatarray/api_traits.hpp>
+#include <libflatarray/macros.hpp>
+#include <libflatarray/short_vec.hpp>
+#include <libflatarray/testbed/cpu_benchmark.hpp>
+
 #include <libgeodecomp/config.h>
 #include <libgeodecomp/misc/apitraits.h>
-#include <libgeodecomp/io/simpleinitializer.h>
-#include <libgeodecomp/misc/chronometer.h>
 #include <libgeodecomp/geometry/coord.h>
-#include <libgeodecomp/geometry/region.h>
 #include <libgeodecomp/storage/unstructuredgrid.h>
 #include <libgeodecomp/storage/unstructuredneighborhood.h>
 #include <libgeodecomp/storage/unstructuredsoagrid.h>
 #include <libgeodecomp/storage/unstructuredsoaneighborhood.h>
 #include <libgeodecomp/storage/unstructuredupdatefunctor.h>
 #include <libgeodecomp/storage/updatefunctor.h>
-
-#include <libflatarray/short_vec.hpp>
-#include <libflatarray/testbed/cpu_benchmark.hpp>
-#include <libflatarray/testbed/evaluate.hpp>
-#include <libflatarray/api_traits.hpp>
-#include <libflatarray/macros.hpp>
+#include <libgeodecomp/io/simpleinitializer.h>
+#include <libgeodecomp/misc/chronometer.h>
+#include <libgeodecomp/geometry/region.h>
 
 #if defined(__AVX__) || defined(__MIC__)
 #include <immintrin.h>