Merge from master to omu/insitu.

[modules/paravis.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3aa7a985119727ffd96321ffca34bd3cde14c149..c196598355e6af920274976002682576fbb62704 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,17 +18,16 @@
 #
 
 SET(_subdirs
-  ENGINE
-  PVGUI
+  Insitu
   PV_SWIG
   Macro
+)
+
+IF(NOT SALOME_LIGHT_ONLY)
+  LIST(APPEND _subdirs
+    PVGUI
   )
-  
-IF(NOT SALOME_PARAVIS_MINIMAL_CORBA)
-  # Append in first position  
-  LIST(INSERT _subdirs 0 VTKWrapping)
-  ADD_DEFINITIONS(-DPARAVIS_WITH_FULL_CORBA)
-ENDIF()
+ENDIF(NOT SALOME_LIGHT_ONLY)
 
 IF(SALOME_PARAVIS_BUILD_PLUGINS)
   LIST(APPEND _subdirs Plugins)
@@ -38,6 +37,3 @@ FOREACH(dir ${_subdirs})
   ADD_SUBDIRECTORY(${dir})
 ENDFOREACH()
 
-SET(WRAP_IDL_I_HH "${WRAP_IDL_I_HH}" PARENT_SCOPE)
-SET(WRAP_IDL_I_CC "${WRAP_IDL_I_CC}" PARENT_SCOPE)
-