Commit Graph

67 Commits

Author SHA1 Message Date
mpa
b920a17059 CMake: Add keyword NOCHECK for accumulating environment because included directories not exists in this moment 2013-10-31 10:57:08 +00:00
vsr
d0f9dcaf72 Merge from BR_hydro 30/10/2013 2013-10-30 16:50:50 +00:00
mpa
b998652209 CMake:
- Accumulate environment variables, to be used later to run some command in proper environment.
2013-10-29 08:07:30 +00:00
mpa
dea655c657 - SALOME_BUILD_DOC, SALOME_BUILD_TESTS and SALOME_BUILD_GUI should be independent in each module
- Add definitions and include directories of dependent modules
2013-10-22 07:24:09 +00:00
vsr
197ecbaecd Handle OpenCV optional product properly 2013-10-14 16:22:57 +00:00
rnc
17497fdd95 BUG: GEOM/CMake build procedure: VTK and OCCT are Geom specifics. They are not used by KERNEL. Putting them before GUI detection broke the detection from GUI configuration when GEOM is built with GUI. 2013-10-11 13:08:43 +00:00
rnv
97a5bf2849 1) Move SalomeGEOMConfig.cmake.in file to module root directory.
2) Move VTK cmake config file from GUI into KERNEL.
2013-10-10 12:47:39 +00:00
vsr
f1519c7ef3 Merge from BR_V7_main_Field branch (02/09/2013) 2013-10-02 13:13:33 +00:00
rnv
a36a39787b Install config files in the adm_local directory. 2013-09-24 12:43:16 +00:00
vsr
155d209381 Documentation is optional 2013-09-21 11:35:49 +00:00
rnv
99980447ac Correct wrong version. 2013-09-19 09:37:56 +00:00
rnv
f51526667e Detection of the OpenCV is OFF by default. 2013-09-17 12:19:05 +00:00
rnc
868245ec86 Update to conform with new macros 2013-09-17 12:00:03 +00:00
vsr
b5c2a231e7 Merge from BR_new_bop4 (porting to new OCCT BOP) 13/09/2013 2013-09-16 13:59:50 +00:00
eap
fcc908e69c CMake porting.
Enable Shape Recognition menu item if OpenCV is available
2013-09-13 09:55:47 +00:00
eap
3ad606e262 1) Rename SALOME_GEOM_USE_GUI -> SALOME_BUILD_GUI
2) Fix detection of OpenCV and building of correspondent sources
3) Fix generation of Sphinx doc's in "build environment"(LD_LIBRARY_PATH not filled)
2013-09-11 14:21:14 +00:00
eap
e7b562779c CMake porting 2013-09-10 12:47:38 +00:00