Salome HOME
ROOT-URANIE patches - seen for Debian 9
[tools/sat_salome.git] / products / patches / URANIE-4.5.0.patch
1 diff -rupN URANIE_ref/CmakePackage/FindCPPUNIT.cmake URANIE_new/CmakePackage/FindCPPUNIT.cmake
2 --- URANIE_ref/CmakePackage/FindCPPUNIT.cmake   2020-11-30 12:46:24.000000000 +0100
3 +++ URANIE_new/CmakePackage/FindCPPUNIT.cmake   2021-04-01 09:38:51.077522950 +0200
4 @@ -3,11 +3,16 @@
5  # It tries to find the club-config script which gives you all the needed information.
6  
7  MESSAGE(STATUS "Looking for CPPUNIT...")
8 +SET(CPPUNIT_ROOT_DIR $ENV{CPPUNIT_ROOT_DIR}  CACHE PATH "PATH TO CPPUNIT.")
9  SET(CPPUNIT_LIB)
10  SET(CPPUNIT_VERSION)
11  SET(CPPUNIT_INCLUDE_DIR)
12  SET(CPPUNIT_LIBRARY_DIR)
13  
14 +IF(CPPUNIT_ROOT_DIR)
15 + LIST(APPEND CMAKE_PREFIX_PATH "${CPPUNIT_ROOT_DIR}")
16 +ENDIF(CPPUNIT_ROOT_DIR)
17 +
18  if(CMAKE_VERBOSE_MAKEFILE STREQUAL "ON")
19      message(STATUS " **** PKG_CONFIG_FOUND [${PKG_CONFIG_FOUND}]")
20      message(STATUS " **** PKG_CONFIG_EXECUTABLE [${PKG_CONFIG_EXECUTABLE}]")
21
22 diff -rupN URANIE_ref/CmakePackage/UranieFindAllPackages.cmake URANIE_new/CmakePackage/UranieFindAllPackages.cmake
23 --- URANIE_ref/CmakePackage/UranieFindAllPackages.cmake 2020-11-30 12:46:24.000000000 +0100
24 +++ URANIE_new/CmakePackage/UranieFindAllPackages.cmake 2021-04-01 09:37:11.801519322 +0200
25 @@ -99,6 +99,10 @@ if(--disable-libxml2 STREQUAL "ON")
26      message(STATUS "Libxml2 is disabled")
27  else(--disable-libxml2 STREQUAL "ON")
28      message(STATUS "Looking for LibXml2...")
29 +    SET(LIBXML2_ROOT_DIR $ENV{LIBXML2_ROOT_DIR} CACHE PATH "Path to the LIBXML2.")
30 +    IF(LIBXML2_ROOT_DIR)
31 +      LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}")
32 +    ENDIF(LIBXML2_ROOT_DIR)
33      find_path(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
34                                  PATHS ENV PATH
35                                  PATH_SUFFIXES ../include)