Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add specific build instructions #15

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add specific build instructions #15

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7e95bad
Add specific building instructions
mad-de Feb 16, 2016
47ac49e
Add specific building instructions
mad-de Feb 16, 2016
79107f5
Add specific building instructions
mad-de Feb 16, 2016
97aeff1
remove README~
mad-de Feb 16, 2016
60bb7eb
Add openmp line
mad-de Feb 16, 2016
3c5d1a1
Update BUILD.md
mad-de Feb 16, 2016
1630dee
Add Openmp to CMaklists.txt
mad-de Feb 16, 2016
9291924
delete line from CMAKELISTS.txt
mad-de Feb 16, 2016
88b95fa
delete line from CMAKELISTS.txt
mad-de Feb 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Windows
Windows => Use precompiled binary, or compile it with VS2008/2010 (Express or pro, Pro will allow you to enable Opemp in CMVS)
=> Use CMake GUI in order to generate the Visual Studio project file (in ./program you will find the main CMakeLists.txt).

# Linux compilations (Ubuntu used as example)
```
#Prepare and empty machine for building:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and -> an

sudo apt-get update -qq && sudo apt-get install -qq
sudo apt-get -y install git jpeg boost boost-graph
git clone https://github.com/pmoulon/CMVS-PMVS
mkdir CMVS-PMVS_build && cd CMVS-PMVS_build
cmake ../CMVS-PMVS/program
make
sudo make install

=> Openmp is not activated yet. Add openmp in the cmvs link option and define the _OPENMP cxx flags
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This step can be performed in the CMakeLists.txt

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are referring to openmp I guess?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, something similar too https://github.com/openMVG/openMVG/blob/master/src/CMakeLists.txt#L117

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just copy and pasted that line from the previous readme file, but I may look into it later.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See https://github.com/mad-de/CMVS-PMVS/commit/1630deeb713ce78fad9344d293cfdbf8efa502c1
I more or less copy'n'pasted it. I added it for cimg_use_openmp which seems to be the only relevant occurence. Haven't thouroughly tested it, but it builds alright.

```
3 changes: 3 additions & 0 deletions README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
This is a modified version of CMVS/PMVS.

Building:
- See https://github.com/pmoulon/CMVS-PMVS/BUILD.md

Main modification:
- cross platform compilation Linux, Windows => CMake build system generator.
- added bug fix from Nghia Ho.
Expand Down
14 changes: 1 addition & 13 deletions Readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,7 @@ Date : 13 July 2011
-- Compilation --
--------------------

Windows => Use precompiled binary, or compile it with VS2008/2010 (Express or pro, Pro will allow you to enable Opemp in CMVS)
=> Use CMake GUI in order to generate the Visual Studio project file (in ./program you will find the main CMakeLists.txt).

Linux => use makefile in program/main.

Or use CMake build system :
=> Install the following libraries : jpeg boost boost-graph
$ mkdir OutputLinux
$ cd OutputLinux
$ cmake . ..
$ make
=> That's all. Openmp is not activated yet. Add openmp in the cmvs link option and define the _OPENMP cxx flags

- See https://github.com/pmoulon/CMVS-PMVS/BUILD.md

--------------------
---- Notes : ----
Expand Down