Skip to content

Commit

Permalink
[build/CI] improvement openMVG#718
Browse files Browse the repository at this point in the history
  • Loading branch information
pmoulon committed Dec 30, 2016
1 parent 49049d3 commit 87ed314
Show file tree
Hide file tree
Showing 47 changed files with 583 additions and 590 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,14 @@ before_script:
- mkdir $OPENMVG_BUILD
- cd $OPENMVG_BUILD
# Classic release build
# - SCHUR_SPECIALIZATIONS set to OFF to speed up build time (ceres)
- >
cmake \
-DCMAKE_CXX_COMPILER=$COMPILER \
-DCMAKE_BUILD_TYPE=release \
-DOpenMVG_BUILD_TESTS=ON \
-DOpenMVG_BUILD_EXAMPLES=ON \
-DSCHUR_SPECIALIZATIONS=OFF \
. $OPENMVG_SOURCE
script:
Expand Down
14 changes: 7 additions & 7 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Build instructions
------------------

Required tools:
* Cmake
* Cmake
* Git
* c/c++ compiler (gcc or visual studio or clang)

Expand Down Expand Up @@ -115,14 +115,14 @@ If you want enable unit tests and examples to the build:
$ cmake -DCMAKE_BUILD_TYPE=RELEASE -DOpenMVG_BUILD_TESTS=ON -DOpenMVG_BUILD_EXAMPLES=ON -G "Xcode" . ../openMVG/src/
$ xcodebuild -configuration Release


--------------------
Using openCV sample
--------------------

Add -DOpenMVG_USE_OPENCV=ON to your cmake command line and set OpenCV_DIR variable to your openCV build directory
=> i.e.: -DOpenCV_DIR="/home/user/Dev/github/itseez/opencv_Build" -DOpenMVG_USE_OPENCV=ON

------------------------------------------------------------
Using OpenMVG as a third party library dependency in cmake
-------------------------------------------------------------
Expand All @@ -139,10 +139,10 @@ Perform "make" and "make install"

Once the library has been installed, go to your project that want use OpenMVG as an external library and add:

FIND_PACKAGE(OpenMVG REQUIRED)
INCLUDE_DIRECTORIES(${OPENMVG_INCLUDE_DIRS})
ADD_EXECUTABLE(main main.cpp)
TARGET_LINK_LIBRARIES(main ${OPENMVG_LIBRARIES})
find_package(OpenMVG REQUIRED)
include_directories(${OPENMVG_INCLUDE_DIRS})
add_executable(main main.cpp)
target_link_libraries(main ${OPENMVG_LIBRARIES})

Specify to CMAKE where OpenMVG have been installed by using the cmake OpenMVG_DIR variable that must point to:
-DOpenMVG_DIR:STRING="YourInstallPath"/share/openMVG/cmake
Expand Down
6 changes: 0 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
version: 1.0.{build}

# branches to build
branches:
# white list
only:
- develop

clone_folder: c:\dev\openMVG

install:
Expand Down
Loading

0 comments on commit 87ed314

Please sign in to comment.