Use the new configuration directory for cmake.

diff --git a/module_generator/doc_tmpl.py b/module_generator/doc_tmpl.py
index e61f2e44afb1a00730e0de44b880d4b49e47128f..bed13624686c758a6a26188564d5aa51cdf76acc 100644 (file)
--- a/module_generator/doc_tmpl.py
+++ b/module_generator/doc_tmpl.py
@@ -27,8 +27,6 @@ except:
 #   module : module name
 #   files : doc source files (.rst)
 docmakefile="""
-INCLUDE($${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake)
-
 SET(RSTFILES
   ${files}
   )
@@ -106,7 +104,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'${module}'
-copyright = u'2010-2015'
+copyright = u'2010-2016'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/module_generator/mod_tmpl.py b/module_generator/mod_tmpl.py
index 0c00a902cb504fef93084dc201b8eaad8d5b5e07..793377ae61076363050a65dda8475945502b0545 100644 (file)
--- a/module_generator/mod_tmpl.py
+++ b/module_generator/mod_tmpl.py
@@ -71,12 +71,20 @@ SET($${PROJECT_NAME_UC}_VERSION
   $${$${PROJECT_NAME_UC}_MAJOR_VERSION}.$${$${PROJECT_NAME_UC}_MINOR_VERSION}.$${$${PROJECT_NAME_UC}_PATCH_VERSION})
 SET($${PROJECT_NAME_UC}_VERSION_DEV 1)
 
+# ===================
+SET(CONFIGURATION_ROOT_DIR $$ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
+IF(EXISTS $${CONFIGURATION_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "$${CONFIGURATION_ROOT_DIR}/cmake")
+  INCLUDE(SalomeMacros)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
+
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $$ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS $${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "$${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-  INCLUDE(SalomeMacros)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
 ELSE(EXISTS $${KERNEL_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")