merge from BR_KERNEL_REFACTORING

[modules/kernel.git] / salome_adm / cmake_files / FindCPPUNIT.cmake

diff --git a/salome_adm/cmake_files/FindCPPUNIT.cmake b/salome_adm/cmake_files/FindCPPUNIT.cmake
index 4193644cd9ae3235f0966f111c200d939f80e641..91594a7f85331475c80c7b2c2332be8499e98f10 100644 (file)
--- a/salome_adm/cmake_files/FindCPPUNIT.cmake
+++ b/salome_adm/cmake_files/FindCPPUNIT.cmake
@@ -52,9 +52,13 @@ ENDIF(WITHOUT_CPPUNIT OR WITH_CPPUNIT STREQUAL 0)
 IF(CPPUNIT_STATUS)
   IF(WITH_CPPUNIT)
     SET(CPPUNIT_ROOT_USER ${WITH_CPPUNIT})
-  ELSE(WITH_CPPUNIT)
-    SET(CPPUNIT_ROOT_USER $ENV{CPPUNIT_ROOT})
   ENDIF(WITH_CPPUNIT)
+  IF(NOT CPPUNIT_ROOT_USER)
+    SET(CPPUNIT_ROOT_USER $ENV{CPPUNIT_ROOT})
+  ENDIF(NOT CPPUNIT_ROOT_USER)
+  IF(NOT CPPUNIT_ROOT_USER)
+    SET(CPPUNIT_ROOT_USER $ENV{CPPUNITHOME})
+  ENDIF(NOT CPPUNIT_ROOT_USER)
 ENDIF(CPPUNIT_STATUS)
 
 # -----
@@ -92,7 +96,7 @@ IF(CPPUNIT_STATUS)
     IF(CPPUNIT_ROOT_USER)
       MESSAGE(STATUS "${CPPUNIT_INCLUDE_TO_FIND} not found in ${CPPUNIT_INCLUDE_PATHS}, check your CPPUNIT installation.")
     ELSE(CPPUNIT_ROOT_USER)
-      MESSAGE(STATUS "${CPPUNIT_INCLUDE_TO_FIND} not found on system, try to use WITH_CPPUNIT option or CPPUNIT_ROOT environment variable.")
+      MESSAGE(STATUS "${CPPUNIT_INCLUDE_TO_FIND} not found on system, try to use WITH_CPPUNIT option or CPPUNIT_ROOT (or CPPUNITHOME) environment variable.")
     ENDIF(CPPUNIT_ROOT_USER)
   ENDIF(CPPUNIT_INCLUDE_DIR)
 ENDIF(CPPUNIT_STATUS)