From: abn <adrien.bruneton@cea.fr>
Date: Mon, 13 Oct 2014 13:09:37 +0000 (+0200)
Subject: Merge branch 'abn/rearch'
X-Git-Tag: V7_5_0b1~27
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ebbd2915a22d111ae165c01dbdd7cd9b12848709;p=modules%2Fparavis.git

Merge branch 'abn/rearch'

Conflicts:
	src/PV_SWIG/VTKWrapping/paravisSM.py -- file deleted!
---

ebbd2915a22d111ae165c01dbdd7cd9b12848709
diff --cc CMakeLists.txt
index 2adec08b,c41977b7..52680155
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -78,7 -78,7 +78,7 @@@ OPTION(SALOME_PARAVIS_ALL_TEST "Add al
  OPTION(SALOME_PARAVIS_BUILD_PLUGINS "Build PARAVIS plugins (MEDReader, etc ...)" ON)
  CMAKE_DEPENDENT_OPTION(SALOME_LIGHT_ONLY "Build SALOME Light only (no CORBA)" OFF
                         "NOT SALOME_KERNEL_LIGHT_ONLY" ON)
--CMAKE_DEPENDENT_OPTION(SALOME_PARAVIS_MINIMAL_CORBA "Build PARAVIS with a minimal CORBA interface" OFF
++CMAKE_DEPENDENT_OPTION(SALOME_PARAVIS_MINIMAL_CORBA "Build PARAVIS with a minimal CORBA interface" ON
                         "NOT SALOME_LIGHT_ONLY" ON)
  
  IF(SALOME_BUILD_TESTS)