Merge branch 'V9_2_2_BR'

[tools/yacsgen.git] / module_generator / mod_tmpl.py

diff --git a/module_generator/mod_tmpl.py b/module_generator/mod_tmpl.py
index 4c3c5875546f568584ee2215dedb2ac5cc96bbc0..c33fa0681837b5b186c918363135735adda0c6c5 100644 (file)
--- a/module_generator/mod_tmpl.py
+++ b/module_generator/mod_tmpl.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2015  EDF R&D
+# Copyright (C) 2009-2019  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,11 +20,12 @@
 try:
   from string import Template
 except:
-  from compat import Template,set
+  from module_generator.compat import Template,set
 
 application="""
 <application>
 <prerequisites path="${prerequisites}"/>
+<context path="${context}"/>
 ${resources}
 <modules>
 ${modules}
@@ -47,6 +48,9 @@ fi
 #   with_doc : ON|OFF
 #   with_gui : ON|OFF - module has its own GUI
 #   add_modules : code to find other modules
+#   major_version : major version of the module
+#   minor_version : minor version of the module
+#   patch_version : patch version of the module
 cmake_root_cpp = """
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
 
@@ -61,19 +65,27 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER $${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET($${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET($${PROJECT_NAME_UC}_MINOR_VERSION 4)
-SET($${PROJECT_NAME_UC}_PATCH_VERSION 0)
+SET($${PROJECT_NAME_UC}_MAJOR_VERSION ${major_version})
+SET($${PROJECT_NAME_UC}_MINOR_VERSION ${minor_version})
+SET($${PROJECT_NAME_UC}_PATCH_VERSION ${patch_version})
 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")
@@ -108,7 +120,9 @@ ENDIF()
 ##
 ## From KERNEL:
 ##
-FIND_PACKAGE(SalomePython REQUIRED)
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+FIND_PACKAGE(SalomePythonLibs REQUIRED)
+
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
   
@@ -130,10 +144,13 @@ IF(SALOME_GUI_MODULE)
   ##
   ## From GUI:
   ##
-  FIND_PACKAGE(SalomeCAS REQUIRED)
-  # Qt4
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-  INCLUDE($${QT_USE_FILE})
+  FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
+  # Qt4/Qt5
+  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+  ELSE()
+    FIND_PACKAGE(SalomeQt5 REQUIRED)
+  ENDIF()
 ENDIF(SALOME_GUI_MODULE)
 
 ${add_modules}