Skip to content

Commit 8256451

Browse files
committed
changes to instructions to reflect boost removal
1 parent b6fa737 commit 8256451

File tree

4 files changed

+6
-31
lines changed

4 files changed

+6
-31
lines changed

doc/doxygen/DICe_MainPage.md

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -823,16 +823,11 @@ The prerequisite dependencies required for installing DICe include:
823823

824824
- LAPACK or [CLAPACK] (http://www.netlib.org/clapack/) (for Windows, only CLAPACK is supported Version 3.2.1 or greater)
825825

826-
- [Boost] (http://www.boost.org) Version 1.55 or greater (tested with 1.55.0)
826+
- [OpenCV] (https://opencv.org/) Version 3.2.0 or greater (tested with 3.2.0)
827827

828-
- [LibTiff] (http://www.remotesensing.org/libtiff/) Version 4.0.6 (tested with 4.0.6)
828+
- Boost is no longer a dependency. It was removed Sept. 2018
829829

830-
Optionally, if jpeg or png files are used for input, the following libraries
831-
are needed:
832-
833-
- [LibPng] (http://www.libpng.org/pub/png/libpng.html) Version 1.6.20
834-
835-
- [LibJpeg] (http://libjpeg.sourceforge.net/) Version 6b
830+
- LibTiff, LifJpeg, and LibPng are also not required anymore, they get built with OpenCV
836831

837832
CMake
838833
-----
@@ -951,10 +946,6 @@ Install the image libraries.
951946

952947
$ sudo apt-get install libtiff-dev libpng-dev libjpeg-dev
953948

954-
Install boost.
955-
956-
$ sudo apt-get install libboost-all-dev
957-
958949
Install NetCDF. After installing netcdf, change some of the defaults in /usr/include/netcdf.h.
959950

960951
$ sudo apt-get install libnetcdf-dev
@@ -1049,22 +1040,6 @@ Next, simply cd into the DICe_gui folder and run the electron executable
10491040
$ <path_to_electron_exec>/electron .
10501041

10511042

1052-
Tiff
1053-
----
1054-
1055-
LibTiff must be installed before building DICe. LibTiff is used in the reading of `.tiff` images. There are many ways to install LibTiff, see [here](http://www.remotesensing.org/libtiff/) for more information. If the tiff library is not in the system path, the user can set the `TIFF_DIR` variabe in the `do-cmake` configuration script to help CMake find the library.
1056-
1057-
Jpeg and Png
1058-
------------
1059-
1060-
The optional `.jpeg` or `.jpg` and `.png` file formats will automatically be enabled if the jpeg and png libraries are in the system path. Otherwise, the `JPEG_DIR` or `PNG_DIR` variables must be set in the `do-cmake` script in order for CMake to find these libraries.
1061-
1062-
Boost
1063-
-----
1064-
1065-
Boost is also a required dependency. DICe makes use of the graphics image library in
1066-
boost. This enables reading standard image formats like `.tiff` files into DICe.
1067-
10681043
DICe Configuration Options
10691044
--------------------------
10701045

scripts/do-dice-cmake-win.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
call <path_to_vcvars64.bat (example: "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64\vcvars64.bat")>
2-
cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE -D DICE_DEBUG_MSG:BOOL=ON -D CMAKE_INSTALL_PREFIX:FILEPATH=<path_to_target_install_location> -D CMAKE_VERBOSE_MAKEFILE:BOOL=OFF -Wno-dev -D DICE_TRILINOS_DIR:FILEPATH=<path_to_trilinos_install> -D CLAPACK_DIR:PATH=<path_to_clapack_build> -DTIFF_DIR:PATH=<path_to_tiff_install> -DJPEG_DIR:PATH=<path_to_jpeg_install(opt.)> -DPNG_DIR:PATH=<path_to_png_install(opt.)> -DZLIB_DIR:PATH=<path_to_dzlib_install(opt.)> -G "NMake Makefiles" ..
1+
cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE -D DICE_DEBUG_MSG:BOOL=ON -D CMAKE_INSTALL_PREFIX:FILEPATH=<path_to_target_install_location> -D DICE_USE_DOUBLE:BOOL=ON -D NetCDF_DIR:STRING=<path> -D HDF5_DIR:STRING=<path> -D OpenCV_DIR:STRING=<path> -D CMAKE_VERBOSE_MAKEFILE:BOOL=OFF -Wno-dev -D DICE_TRILINOS_DIR:FILEPATH=<path_to_trilinos_install> -D CLAPACK_DIR:PATH=<path_to_clapack_build> -G "NMake Makefiles" ..

scripts/do-opencv-cmake-win.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE -D BUILD_opencv_static=ON -D WITH_FFMPEG=OFF -D WITH_IPP=OFF -D CMAKE_INSTALL_PREFIX:FILEPATH=<path> -D CMAKE_VERBOSE_MAKEFILE:BOOL=OFF -G "NMake Makefiles" ..
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cmake -D CMAKE_INSTALL_PREFIX:PATH=<path_to_where_trilinos_will_be_installed> -D CMAKE_BUILD_TYPE:STRING=RELEASE -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON -D Trilinos_ASSERT_MISSING_PACKAGES=OFF -D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF -D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF -D Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES:BOOL=OFF -D TPL_ENABLE_Pthread:BOOL=OFF -D TPL_ENABLE_Boost:BOOL=ON -DBoost_LIBRARY_DIRS:PATH="<path_to_boost>\install\lib" -DBoost_INCLUDE_DIRS:PATH="<path_to_boost>\install\include" -D TPL_ENABLE_MPI:BOOL=OFF -D Trilinos_ENABLE_Fortran:BOOL=OFF -D CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE -D Trilinos_ENABLE_TeuchosCore:BOOL=ON -D Trilinos_ENABLE_TeuchosParameterList:BOOL=ON -D Trilinos_ENABLE_TeuchosNumerics:BOOL=ON -D Trilinos_ENABLE_CXX11:BOOL=ON -D Trilinos_ENABLE_Epetra:BOOL=ON -D Trilinos_ENABLE_OpenMP:BOOL=ON -D BLAS_LIBRARY_DIRS:PATH="<path_to_clapack>\BLAS\SRC" -D LAPACK_LIBRARY_DIRS:PATH="<path_to_clapack>\build_intel\SRC" -DTrilinos_ENABLE_TESTS:BOOL=ON -D CMAKE_C_COMPILER:PATH="C:\Program Files (x86)\Intel\Composer XE 2015\bin\intel64\icl.exe" -D CMAKE_CXX_COMPILER:PATH="C:\Program Files (x86)\Intel\Composer XE 2015\bin\intel64\icl.exe" -DCMAKE_C_COMPILER_ID="Intel" -DCMAKE_C_COMPILER_VERSION="15.0.1.148" -DCMAKE_CXX_COMPILER_ID="Intel" -DCMAKE_CXX_COMPILER_VERSION="15.0.1.148" -DCMAKE_EXE_LINKER_FLAGS:STRING="<path_to_clapack>\F2CLIBS\libf2c\libf2c.lib" -G "NMake Makefiles" ..
1+
cmake -D CMAKE_INSTALL_PREFIX:PATH=<path_to_where_trilinos_will_be_installed> -D CMAKE_BUILD_TYPE:STRING=RELEASE -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON -D Trilinos_ASSERT_MISSING_PACKAGES=OFF -D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF -D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF -D Trilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES:BOOL=OFF -D TPL_ENABLE_Pthread:BOOL=OFF -D TPL_ENABLE_Boost:BOOL=OFF -D TPL_ENABLE_MPI:BOOL=OFF -D Trilinos_ENABLE_Fortran:BOOL=OFF -D CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE -D Trilinos_ENABLE_TeuchosCore:BOOL=ON -D Trilinos_ENABLE_TeuchosParameterList:BOOL=ON -D Trilinos_ENABLE_TeuchosNumerics:BOOL=ON -D Trilinos_ENABLE_CXX11:BOOL=ON -D Trilinos_ENABLE_Epetra:BOOL=ON -D Trilinos_ENABLE_OpenMP:BOOL=ON -D BLAS_LIBRARY_DIRS:PATH="<path_to_clapack>\BLAS\SRC" -D LAPACK_LIBRARY_DIRS:PATH="<path_to_clapack>\build_intel\SRC" -DTrilinos_ENABLE_TESTS:BOOL=ON -D CMAKE_C_COMPILER:PATH="C:\Program Files (x86)\Intel\Composer XE 2015\bin\intel64\icl.exe" -D CMAKE_CXX_COMPILER:PATH="C:\Program Files (x86)\Intel\Composer XE 2015\bin\intel64\icl.exe" -DCMAKE_C_COMPILER_ID="Intel" -DCMAKE_C_COMPILER_VERSION="15.0.1.148" -DCMAKE_CXX_COMPILER_ID="Intel" -DCMAKE_CXX_COMPILER_VERSION="15.0.1.148" -DCMAKE_EXE_LINKER_FLAGS:STRING="<path_to_clapack>\F2CLIBS\libf2c\libf2c.lib" -G "NMake Makefiles" ..

0 commit comments

Comments
 (0)