Merge branch 'develop'

Author: cdcseacave

.appveyor.yml

@@ -106,3 +106,7 @@ build_script:
 test_script:
   #- cmd: ctest --build-config %Configuration% --parallel 4 --output-on-failure
   #- sh: ctest -j4
+  
+on_success:
+  - cmd: 7z a OpenMVS_x64.7z "C:\projects\openmvs\bin\bin\x64\%Configuration%\*.exe" "C:\projects\openmvs\bin\bin\x64\%Configuration%\*.dll"
+  - cmd: appveyor PushArtifact OpenMVS_x64.7z

.gitignore

@@ -26,3 +26,13 @@
 *.exe
 *.out
 *.app
+
+# Custom
+*.tmp
+.DS_Store
+CMakeSettings.json
+.vs/
+.idea/
+.vscode/
+bin/
+binaries/

README.md

@@ -14,6 +14,7 @@ See the complete [documentation](https://github.com/cdcseacave/openMVS/wiki) on
 ## Build
 
 See the [building](https://github.com/cdcseacave/openMVS/wiki/Building) wiki page. Windows and Ubuntu x64 continuous integration status [![Build Status](https://ci.appveyor.com/api/projects/status/github/cdcseacave/openmvs?branch=master&svg=true)](https://ci.appveyor.com/project/cdcseacave/openmvs)
+Automatic Windows x64 binary builds can be found for each commit on its Appveyor Artifacts page.
 
 ## Example
 

apps/CMakeLists.txt

@@ -1,4 +1,5 @@
 # Add applications
+ADD_SUBDIRECTORY(InterfaceCOLMAP)
 ADD_SUBDIRECTORY(InterfaceVisualSFM)
 ADD_SUBDIRECTORY(DensifyPointCloud)
 ADD_SUBDIRECTORY(ReconstructMesh)

apps/InterfaceCOLMAP/CMakeLists.txt

@@ -0,0 +1,17 @@
+if(MSVC)
+	FILE(GLOB LIBRARY_FILES_C "*.cpp" "*.rc")
+else()
+	FILE(GLOB LIBRARY_FILES_C "*.cpp")
+endif()
+FILE(GLOB LIBRARY_FILES_H "*.h" "*.inl")
+
+cxx_executable_with_flags_no_pch(InterfaceCOLMAP "Apps" "${cxx_default}" "MVS" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H})
+
+if(3Dnovator_USE_BREAKPAD AND BREAKPAD_FOUND)
+	target_link_libraries(InterfaceCOLMAP ${BREAKPAD_LIBS})
+endif()
+
+# Install
+INSTALL(TARGETS InterfaceCOLMAP
+	EXPORT 3DnovatorTargets
+	RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT bin)