From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Mon, 20 Jul 2015 12:41:54 +0000 (+0200)
Subject: Merge branch 'master' of https://git.salome-platform.org/git/modules/paravis
X-Git-Tag: simple_cmake~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e006e7d4f09b179c9c7819297cd0b877be6b158f;p=modules%2Fparavis.git

Merge branch 'master' of https://git.salome-platform.org/git/modules/paravis
---

e006e7d4f09b179c9c7819297cd0b877be6b158f
diff --cc CMakeLists.txt
index 61c7bd65,013d5715..48b6d2ef
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -260,15 -246,11 +255,11 @@@ MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFI
  # Accumulate environment variables for PARAVIS module
  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
                                                   ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
 -SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
 +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS})
  SALOME_ACCUMULATE_ENVIRONMENT(PV_PLUGIN_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/lib/paraview)
  
 -# Sources 
 +# Sources
  # ========
- IF(NOT SALOME_LIGHT_ONLY)
-   ADD_SUBDIRECTORY(idl)   # Order matters when using the wrapping - to be added AFTER src
- ENDIF()
- 
  ADD_SUBDIRECTORY(src)
  ADD_SUBDIRECTORY(adm_local)
  ADD_SUBDIRECTORY(resources)