From: bruneton <bruneton>
Date: Tue, 9 Jul 2013 09:10:12 +0000 (+0000)
Subject: CMake: changed variable used for conflict detection: MEDFILE_INCLUDE_DIRS
X-Git-Tag: B4KillOfAutomake~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=440ba9790c0cc91d6a1e2d45020b9fbc7076f888;p=modules%2Fkernel.git

CMake: changed variable used for conflict detection: MEDFILE_INCLUDE_DIRS
which exists in both CONFIG and MODULE mode.
---

diff --git a/salome_adm/cmake_files/FindSalomeMEDFile.cmake b/salome_adm/cmake_files/FindSalomeMEDFile.cmake
index f890f17a9..a44420836 100644
--- a/salome_adm/cmake_files/FindSalomeMEDFile.cmake
+++ b/salome_adm/cmake_files/FindSalomeMEDFile.cmake
@@ -24,5 +24,5 @@
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MEDFile MEDFILE_ROOT_DIR_EXP 0)
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MEDFile MEDFILE_INCLUDE_DIRS 1)
 #MARK_AS_ADVANCED()