Conflicts:
cmake_files/SalomeMacros.cmake - staying aligned with master of KERNEL
#
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})
# 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