[continuous integration] Setup an Appveyor CI. openMVG#466

  - Initial draft

README.md

@@ -20,10 +20,10 @@ Building
 
 See [BUILD](https://github.com/openMVG/openMVG/raw/master/BUILD) text file
 
-Continuous integration [![Build Status](https://travis-ci.org/openMVG/openMVG.png?branch=develop)](https://travis-ci.org/openMVG/openMVG) [![Coverage Status](https://coveralls.io/repos/openMVG/openMVG/badge.png?branch=develop)](https://coveralls.io/r/openMVG/openMVG?branch=develop):
- - develop branch: BUILD + UNIT TESTING
- - linux 64 bits (GCC + clang).
-
+Continuous integration:
+ - linux 64 bits/GCC (Build + tests): [![Build Status](https://travis-ci.org/openMVG/openMVG.png?branch=develop)](https://travis-ci.org/openMVG/openMVG)
+ - VStudio 2015 64 bits (Build): [![Build status](https://ci.appveyor.com/api/projects/status/3nv6rt41yxqx5v7i?svg=true)](https://ci.appveyor.com/project/pmoulon/openmvg)
+ - Unit test coverage: [![Coverage Status](https://coveralls.io/repos/openMVG/openMVG/badge.png?branch=develop)](https://coveralls.io/r/openMVG/openMVG?branch=develop)
 
 -------
 License

appveyor.yml

@@ -0,0 +1,38 @@
+version: 1.0.{build}
+
+# branches to build
+branches:
+  # white list
+  only:
+    - develop_appveyor
+    - develop
+
+clone_folder: c:\dev\openMVG
+
+install:
+  - git submodule update --init --recursive
+
+environment:
+  matrix:
+    - GENERATOR: "Visual Studio 14 2015 Win64"
+    - GENERATOR: "Visual Studio 14 2015"
+
+build_script:
+  - cd c:\dev\openMVG
+  - md openMVG_build
+  - cd openMVG_build
+  # Configure:
+  # - ceres - SCHUR_SPECIALIZATIONS set to OFF to speed up build time 
+  - cmake -G"%GENERATOR%" -DOpenMVG_BUILD_EXAMPLES=OFF -DOpenMVG_BUILD_TESTS=ON -DSCHUR_SPECIALIZATIONS=OFF ../src/
+  # Build:
+  # - only some targets since there is no time to compile all
+  # - in debug mode, since the build is faster and VisualStudio reporting is better
+  - cmake --build . --config Debug --target openMVG_test_sequential_SfM
+  - cmake --build . --config Debug --target openMVG_test_global_SfM
+  - cmake --build . --config Debug --target openMVG_main_IncrementalSfM
+  - cmake --build . --config Debug --target openMVG_main_GlobalSfM
+
+build:
+  parallel: true
+  verbosity: minimal
+

src/CMakeLists.txt

@@ -54,6 +54,7 @@ SET(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/${CMAKE_SYSTEM_NAME}-${CMAKE_SYST
 
 IF (WIN32)
   ADD_DEFINITIONS(-DNOMINMAX)
+  ADD_DEFINITIONS(-DVC_EXTRALEAN)
   IF (MSVC)
     ADD_DEFINITIONS(/bigobj)
   ENDIF (MSVC)
@@ -432,7 +433,6 @@ ENDIF (OpenMVG_BUILD_EXAMPLES)
 # Complete software(s) build on openMVG libraries
 ADD_SUBDIRECTORY(software)
 
-# software(s) under patent or commercial licence
 # Included for research purpose only
 ADD_SUBDIRECTORY(nonFree)
 

src/openMVG/matching/matcher_brute_force.hpp

@@ -135,9 +135,8 @@ class ArrayMatcherBruteForce  : public ArrayMatcher<Scalar, Metric>
 
       // Find the N minimum distances:
       const int maxMinFound = (int) min( size_t(NN), vec_distance.size());
-      using namespace stl::indexed_sort;
-      vector< sort_index_packet_ascend< DistanceType, int> > packet_vec(vec_distance.size());
-      sort_index_helper(packet_vec, &vec_distance[0], maxMinFound);
+      std::vector< stl::indexed_sort::sort_index_packet_ascend< DistanceType, int> > packet_vec(vec_distance.size());
+      stl::indexed_sort::sort_index_helper(packet_vec, &vec_distance[0], maxMinFound);
 
       for (int i = 0; i < maxMinFound; ++i) {
         (*pvec_distances)[queryIndex*NN+i] = packet_vec[i].val;

src/third_party/eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h

@@ -141,7 +141,7 @@ static void run(Index rows, Index cols, Index depth,
       // i.e., we simply decrement the number of users by 1
       for(Index j=0; j<threads; ++j)
         #pragma omp atomic
-        --(info[j].users);
+          info[j].users -= 1;
     }
   }
   else

src/third_party/flann/CMakeLists.txt

@@ -15,11 +15,11 @@ GET_OS_INFO()
 # CMAKE_C_COMPILER_ID and CMAKE_CXX_COMPILER_ID are documented as internal variables subject to
 # change at: http://www.cmake.org/cmake/help/v2.8.8/cmake.html#variable:CMAKE_LANG_COMPILER_ID
 # however currently this seems the most robust way to detect the presence of the Clang compiler
-if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)
 endif ()
 
-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANGXX 1)
 endif ()