CMake: installing configuration file into share/cmake/libbatch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7359c7351fa5c0b583beb87500722a05ec47d746..c84baf26a27165711104cbcc58fe0827f795c77a 100644 (file)
--- 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 3741aea0c619cbe4fc11a7370882b7d61297ed0e..323e2e5c9e2f191cc3dee201417d5063b9d58c73 100644 (file)
--- 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