Peter M. Groen / openbr

Commit 117435c02859dbf4fddfa4bca588a31570291139

Authored by Josh Klontz
1 parent 7dd634b3

updated ubuntu build instructions

Inline Side-by-side
Showing 1 changed file with 39 additions and 101 deletions
openbr/openbr_export.cpp
  View file @117435c
... ... @@ -45,8 +45,7 @@
45 45 * - \subpage windows_msvc
46 46 * - \subpage windows_mingw
47 47 * - \subpage osx_clang
48   - * - \subpage linux_gcc
49   - * - \subpage linux_icc
  48 + * - \subpage linux_all
50 49 *
51 50 * \section installation_from_binary From Binary
52 51 * Pre-compiled releases are not currently provided, but they can be built from source using the instructions above.
... ... @@ -150,7 +149,7 @@ $ br -help
150 149 * -# For "Compiler:" select "Microsoft Visual C++ Compiler 11.0 (amd64)" and click "OK"
151 150 * -# From the Qt Creator "File" menu select "Open File or Project...".
152 151 * -# Select "C:\openbr\CMakeLists.txt" then "Open".
153   - * -# Browse to your prexisting build directory "C:\openbr\build-msvc2012" then select "Next".
  152 + * -# Browse to your pre-existing build directory "C:\openbr\build-msvc2012" then select "Next".
154 153 * -# Clear any text in the "arguments" box then select "Run CMake" then "Finish".
155 154 * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need.
156 155 * -# (Optional) Package OpenBR!
... ... @@ -229,7 +228,7 @@ $ br -help
229 228 * -# For "Compiler:" select "MinGW (x86 64bit)" and click "OK"
230 229 * -# From the Qt Creator "File" menu select "Open File or Project...".
231 230 * -# Select "C:\openbr\CMakeLists.txt" then "Open".
232   - * -# Browse to your prexisting build directory "C:\openbr\build-mingw64" then select "Next".
  231 + * -# Browse to your pre-existing build directory "C:\openbr\build-mingw64" then select "Next".
233 232 * -# Clear any text in the "arguments" box then select "Run CMake" then "Finish".
234 233 * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need.
235 234 * -# (Optional) Package OpenBR!
... ... @@ -278,8 +277,7 @@ $ br -help
278 277 * \endcode
279 278 * -# Build OpenBR!
280 279 * \code
281   - * $ cd openbr
282   - * $ mkdir build
  280 + * $ mkdir build # from the OpenBR root directory
283 281 * $ cd build
284 282 * $ cmake -DCMAKE_PREFIX_PATH=~/Qt5.0.2/5.0.2/clang_64 -DCMAKE_BUILD_TYPE=Release ..
285 283 * $ make -j4
... ... @@ -292,7 +290,7 @@ $ br -help
292 290 * \endcode
293 291 * -# From the Qt Creator "File" menu select "Open File or Project...".
294 292 * -# Select "openbr/CMakeLists.txt" then "Open".
295   - * -# Browse to your prexisting build directory "openbr/build" then select "Continue".
  293 + * -# Browse to your pre-existing build directory "openbr/build" then select "Continue".
296 294 * -# Select "Run CMake" then "Done".
297 295 * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator">here</a> if you need.
298 296 * -# (Optional) Test OpenBR!
... ... @@ -305,7 +303,7 @@ $ br -help
305 303 * -# (Optional) Package OpenBR!
306 304 * \code
307 305 * $ cd openbr/build
308   - * $ cpack -G TGZ
  306 + * $ sudo cpack -G TGZ
309 307 * \endcode
310 308 * -# (Optional) Build OpenBR documentation!
311 309 * -# <a href="ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.2.src.tar.gz">Download Doxygen 1.8.2</a>
... ... @@ -329,42 +327,33 @@ $ br -help
329 327 */
330 328  
331 329 /*!
332   - * \page linux_gcc Ubuntu 12.04 LTS - GCC 4.6.3 - x64
333   - * -# Install GCC 4.6.3.
  330 + * \page linux_all Ubuntu 13.04 - GCC 4.7.3 or ICC 13.1.1 - x64
  331 + * -# Install GCC 4.7.3
334 332 * \code
335 333 * $ sudo apt-get update
336 334 * $ sudo apt-get install build-essential
337 335 * \endcode
338   - * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz">Download CMake 2.8.10.2</a>.
  336 + * -# (Optional) Assuming you meet the eligibility requirements and you want to use ICC instead of GCC, <a href="http://software.intel.com/en-us/non-commercial-software-development">Download and Install Intel C++ Studio XE 2013</a>.
  337 + * -# Install CMake 2.8.10.1
339 338 * \code
340   - * $ cd ~/Downloads
341   - * $ tar -xf cmake-2.8.10.2.tar.gz
342   - * $ cd cmake-2.8.10.2
343   - * $ ./configure
344   - * $ make -j4
345   - * $ sudo make install
346   - * $ cd ..
347   - * $ rm -r cmake-2.8.10.2
  339 + * $ sudo apt-get install cmake cmake-curses-gui
348 340 * \endcode
349   - * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>.
  341 + * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.5/opencv-2.4.5.tar.gz">Download OpenCV 2.4.5</a>
350 342 * \code
351 343 * $ cd ~/Downloads
352   - * $ tar -xf OpenCV-2.4.4.tar.bz2
353   - * $ cd OpenCV-2.4.4
  344 + * $ tar -xf opencv-2.4.5.tar.gz
  345 + * $ cd opencv-2.4.5
354 346 * $ mkdir build
355 347 * $ cd build
356   - * $ cmake -DBUILD_opencv_java=OFF -DBUILD_opencv_world=ON -DCMAKE_BUILD_TYPE=Release ..
  348 + * $ cmake -DCMAKE_BUILD_TYPE=Release ..
357 349 * $ make -j4
358 350 * $ sudo make install
359 351 * $ cd ../..
360   - * $ rm -r OpenCV-2.4.4
  352 + * $ rm -rf opencv-2.4.5*
361 353 * \endcode
362   - * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a>.
  354 + * -# Install Qt 5.0.1
363 355 * \code
364   - * $ cd ~/Downloads
365   - * $ chmod +x qt-linux-opensource-5.0.1-x86_64-offline.run
366   - * $ ./qt-linux-opensource-5.0.1-x86_64-offline.run
367   - * $ rm qt-linux-opensource-5.0.1-x86_64-offline.run
  356 + * $ sudo apt-get install qt5-default libqt5svg5-dev qtcreator
368 357 * \endcode
369 358 * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>.
370 359 * \code
... ... @@ -375,94 +364,43 @@ $ br -help
375 364 * \endcode
376 365 * -# Build OpenBR!
377 366 * \code
378   - * $ cd openbr
379   - * $ mkdir build
  367 + * $ mkdir build # from the OpenBR root directory
380 368 * $ cd build
381   - * $ cmake -DCMAKE_PREFIX_PATH=~/Qt5.0.1/5.0.1/gcc_64 -DCMAKE_BUILD_TYPE=Release ..
  369 + * $ cmake -DCMAKE_BUILD_TYPE=Release .. # GCC Only
  370 + * $ cmake -DCMAKE_C_COMPILER=/opt/intel/bin/icc -DCMAKE_CXX_COMPILER=/opt/intel/bin/icpc -DCMAKE_BUILD_TYPE=Release .. # ICC Only
382 371 * $ make -j4
383 372 * $ sudo make install
384 373 * \endcode
385 374 * -# Hack OpenBR!
386 375 * -# Open Qt Creator IDE
387 376 * \code
388   - * $ ~/Qt5.0.1/Tools/QtCreator/bin/qtcreator &
  377 + * $ qtcreator &
389 378 * \endcode
390 379 * -# From the Qt Creator "File" menu select "Open File or Project...".
391   - * -# Select "~/openbr/CMakeLists.txt" then "Open".
392   - * -# Browse to your prexisting build directory "~/openbr/build" then select "Next".
  380 + * -# Select "openbr/CMakeLists.txt" then "Open".
  381 + * -# Browse to your pre-existing build directory "openbr/build" then select "Next".
393 382 * -# Select "Run CMake" then "Finish".
394   - * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need.
395   - * -# (Optional) Package OpenBR!
396   - * \code
397   - * $ cd openbr/build
398   - * $ make package
399   - * \endcode
400   - */
401   -
402   -/*!
403   - * \page linux_icc Ubuntu 12.04 LTS - Intel C++ Studio XE 2013 - x64
404   - * -# Assuming you meet the eligibility requirements, <a href="http://software.intel.com/en-us/non-commercial-software-development">Download Intel C++ Studio XE 2013</a> and install.
405   - * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz">Download CMake 2.8.10.2</a>.
406   - * \code
407   - * $ cd ~/Downloads
408   - * $ tar -xf cmake-2.8.10.2.tar.gz
409   - * $ cd cmake-2.8.10.2
410   - * $ ./configure
411   - * $ make -j4
412   - * $ sudo make install
413   - * $ cd ..
414   - * $ rm -r cmake-2.8.10.2
415   - * \endcode
416   - * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>.
417   - * \code
418   - * $ cd ~/Downloads
419   - * $ tar -xf OpenCV-2.4.4.tar.bz2
420   - * $ cd OpenCV-2.4.4
421   - * $ mkdir build
422   - * $ cd build
423   - * $ cmake cmake -DBUILD_opencv_java=OFF -DBUILD_opencv_world=ON -DCMAKE_BUILD_TYPE=Release ..
424   - * $ make -j4
425   - * $ sudo make install
426   - * $ cd ../..
427   - * $ rm -r OpenCV-2.4.4
428   - * \endcode
429   - * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a>.
430   - * \code
431   - * $ cd ~/Downloads
432   - * $ chmod +x qt-linux-opensource-5.0.1-x86_64-offline.run
433   - * $ ./qt-linux-opensource-5.0.1-x86_64-offline.run
434   - * $ rm qt-linux-opensource-5.0.1-x86_64-offline.run
435   - * \endcode
436   - * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>.
  383 + * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator">here</a> if you need.
  384 + * -# (Optional) Test OpenBR!
437 385 * \code
438   - * $ git clone https://github.com/biometrics/openbr.git
439   - * $ cd openbr
440   - * $ git submodule init
441   - * $ git submodule update
  386 + * $ cd openbr/scripts
  387 + * $ ./downloadDatasets.sh
  388 + * $ cd ../build
  389 + * $ make test
442 390 * \endcode
443   - * -# Build OpenBR!
  391 + * -# (Optional) Package OpenBR!
444 392 * \code
445   - * $ cd openbr
446   - * $ mkdir build-icc
447   - * $ cd build-icc
448   - * $ cmake -DCMAKE_C_COMPILER=/opt/intel/bin/icc -DCMAKE_CXX_COMPILER=/opt/intel/bin/icpc -DCMAKE_PREFIX_PATH=~/Qt5.0.1/5.0.1/gcc_64 -DCMAKE_BUILD_TYPE=Release ..
449   - * $ make -j4
450   - * $ sudo make install
  393 + * $ cd openbr/build
  394 + * $ sudo cpack -G TGZ
451 395 * \endcode
452   - * -# Hack OpenBR!
453   - * -# Open Qt Creator IDE
454   - * \code
455   - * $ ~/Qt5.0.1/Tools/QtCreator/bin/qtcreator &
456   - * \endcode
457   - * -# From the Qt Creator "File" menu select "Open File or Project...".
458   - * -# Select "~/openbr/CMakeLists.txt" then "Open".
459   - * -# Browse to your prexisting build directory "~/openbr/build" then select "Next".
460   - * -# Select "Run CMake" then "Finish".
461   - * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need.
462   - * -# (Optional) Package OpenBR!
  396 + * -# (Optional) Build OpenBR documentation!
463 397 * \code
  398 + * $ sudo apt-get install doxygen
464 399 * $ cd openbr/build
465   - * $ make package
  400 + * $ cmake -DBR_BUILD_DOCUMENTATION=ON ..
  401 + * $ make -j4
  402 + * $ sudo apt-get install libgnome2-bin
  403 + * $ gnome-open html/index.html
466 404 * \endcode
467 405 */
468 406  
... ...