Merge branch 'V7_dev'

Conflicts:
	cmake_files/SalomeMacros.cmake - staying aligned with master of KERNEL

diff --git a/cmake_files/CMakeLists.txt b/cmake_files/CMakeLists.txt
index 0623d6443ab44c306894430f2d4d0a6325cde474..056850012325ba4d9aef5b2d7cdd5ebe41923db2 100644 (file)
--- a/cmake_files/CMakeLists.txt
+++ b/cmake_files/CMakeLists.txt
@@ -18,15 +18,32 @@
 #
 
 SET(admlocal_cmake_DATA
+    FindCppUnit.cmake
+    FindGraphviz.cmake
+    FindMEDFile.cmake
     FindMetis.cmake
     FindParMetis.cmake
+    FindSalomeBoost.cmake
+    FindSalomeCppUnit.cmake
+    FindSalomeDoxygen.cmake
+    FindSalomeGraphviz.cmake
+    FindSalomeHDF5.cmake
+    FindSalomeLibXml2.cmake
     FindSalomeMEDCoupling.cmake
+    FindSalomeMEDFile.cmake
     FindSalomeMetis.cmake
+    FindSalomeMPI.cmake
     FindSalomeParMetis.cmake
+    FindSalomePython.cmake
     FindSalomeScotch.cmake
+    FindSalomeSphinx.cmake
+    FindSalomeSWIG.cmake
     FindSalomeXDR.cmake
     FindScotch.cmake
+    FindSphinx.cmake
     FindXDR.cmake
+    SalomeMacros.cmake
+    SalomeSetupPlatform.cmake
 )
 
 INSTALL(FILES ${admlocal_cmake_DATA} DESTINATION ${MEDCOUPLING_INSTALL_CMAKE_LOCAL})

diff --git a/cmake_files/SalomeMacros.cmake b/cmake_files/SalomeMacros.cmake
index 34f85786d2d062f94631dfcefe31e824c1774635..3ea9ae6c800c1ab232164c07960c3034637cfcb6 100644 (file)
--- a/cmake_files/SalomeMacros.cmake
+++ b/cmake_files/SalomeMacros.cmake
@@ -507,8 +507,8 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
   
   # Override the variable - don't append to it, as it would give precedence
   # to what was stored there before!  
-  IF(DEFINED ${_envvar})
-    SET(CMAKE_PREFIX_PATH "${${_envvar}}")
+  IF(DEFINED ENV{${pkg_UC}_ROOT_DIR})
+    SET(CMAKE_PREFIX_PATH "${${pkg_UC}_ROOT_DIR}")
   ENDIF()
     
   # Try find_package in config mode. This has the priority, but is