Salome HOME
topo2vol: use CEA repository
[tools/sat_salome.git] / products / patches / root-6.22.06.patch
1 diff -rupN root_ref/cmake/modules/SearchInstalledSoftware.cmake root_new/cmake/modules/SearchInstalledSoftware.cmake
2 --- root_ref/cmake/modules/SearchInstalledSoftware.cmake        2020-08-17 14:41:56.000000000 +0200
3 +++ root_new/cmake/modules/SearchInstalledSoftware.cmake        2021-04-01 13:22:21.914013106 +0200
4 @@ -82,6 +82,10 @@ endif()
5  #---Check for Freetype---------------------------------------------------------------
6  if(NOT builtin_freetype)
7    message(STATUS "Looking for Freetype")
8 +  SET(FREETYPE_ROOT_DIR $ENV{FREETYPE_ROOT_DIR} CACHE PATH "Path to the FreeType.")
9 +  IF(FREETYPE_ROOT_DIR)
10 +    LIST(APPEND CMAKE_PREFIX_PATH "${FREETYPE_ROOT_DIR}")
11 +  ENDIF(FREETYPE_ROOT_DIR)
12    if(fail-on-missing)
13      find_package(Freetype REQUIRED)
14    else()
15 @@ -574,6 +578,10 @@ endif()
16  #---Check for XML Parser Support-----------------------------------------------------------
17  if(xml)
18    message(STATUS "Looking for LibXml2")
19 +  SET(LIBXML2_ROOT_DIR $ENV{LIBXML2_ROOT_DIR} CACHE PATH "Path to the LIBXML2.")
20 +  IF(LIBXML2_ROOT_DIR)
21 +    LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}")
22 +  ENDIF(LIBXML2_ROOT_DIR)
23    find_package(LibXml2)
24    if(NOT LIBXML2_FOUND)
25      if(fail-on-missing)