From: bruneton <bruneton>
Date: Tue, 2 Jul 2013 08:17:12 +0000 (+0000)
Subject: CMake: installing configuration file into share/cmake/libbatch
X-Git-Tag: V2_1_0rc1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5aedd49a7f65c45c9e20809076e1aca6e62885a3;p=tools%2Flibbatch.git

CMake: installing configuration file into share/cmake/libbatch
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7359c73..c84baf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ INCLUDE(libbatchMacros)
 
 # User options
 # ============
-SET(INSTALL_CMAKE_CONFIG_DIR share/cmake)
+SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/libbatch)
 SET(INSTALL_INCLUDE_DIR include)
 
 SET(LIBBATCH_LOCAL_SUBMISSION TRUE CACHE BOOL "Build classes for local submission")
diff --git a/CMakeModules/libbatchMacros.cmake b/CMakeModules/libbatchMacros.cmake
index 3741aea..323e2e5 100644
--- a/CMakeModules/libbatchMacros.cmake
+++ b/CMakeModules/libbatchMacros.cmake
@@ -278,7 +278,8 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
         MESSAGE(STATUS "${pkg} found directory matches what was specified in the ${pkg_UC}_ROOT_DIR variable, all good!")    
       ENDIF()
     ELSE()
-        MESSAGE(STATUS "Environment variable ${pkg_UC}_ROOT_DIR is not defined. The system installation was found.")
+        MESSAGE(STATUS "Variable ${pkg_UC}_ROOT_DIR was not explicitly defined: "
+          "an installation was found anyway: ${_tmp_ROOT_DIR}")
     ENDIF()
 
     # 5. Conflict detection