Corrected compilation error. Cannot factor Find(SalomeKernel)

diff --git a/CoreFlows/CMakeLists.txt b/CoreFlows/CMakeLists.txt
index 2ae4ed2a442b7d925da3f8c2440df7b914965d9c..c517df24ab8eef53fb2805676709a7f6f45385e1 100755 (executable)
--- a/CoreFlows/CMakeLists.txt
+++ b/CoreFlows/CMakeLists.txt
@@ -100,15 +100,6 @@ if  ( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) A
          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} )
-         FIND_PACKAGE(SalomeKERNEL REQUIRED)
-       ELSE( EXISTS ${KERNEL_ROOT_DIR} )
-         MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR!")
-       ENDIF( EXISTS ${KERNEL_ROOT_DIR} )
-       
        # Find SALOME GUI 
        # ==============
        SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
@@ -118,19 +109,6 @@ if  ( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) A
          MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR!")
        ENDIF(EXISTS ${GUI_ROOT_DIR})
        
-       # Platform setup
-       # ==============
-       INCLUDE(SalomeSetupPlatform)   # From KERNEL
-           
-       # Prerequisites
-       # =============
-       
-       # Mandatory products
-       FIND_PACKAGE(SalomePythonInterp REQUIRED)
-       FIND_PACKAGE(SalomePythonLibs REQUIRED)
-       
-       MESSAGE(STATUS "SalomeKERNEL_VERSION is ${SalomeKERNEL_VERSION}")
-
 endif( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) )                                                                                                        #
 #---------------------------------------------------------------------------------------------------------------#
 

diff --git a/CoreFlows/examples/Python/CMakeLists.txt b/CoreFlows/examples/Python/CMakeLists.txt
index 4cffece265cb50b58b70914caac3f294243af5e8..b82b7f9cb6fe3a16e4147b6ce045817e54ac48f9 100755 (executable)
--- a/CoreFlows/examples/Python/CMakeLists.txt
+++ b/CoreFlows/examples/Python/CMakeLists.txt
@@ -2,6 +2,27 @@
                                                                                                                #
 if  ( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) )
 
+       # Common CMake macros
+       # ===================
+       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 NO_POLICY_SCOPE)
+       ELSE()
+         MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+       ENDIF()
+                                                                                                               #
+       # Find Salome KERNEL 
+       # ==================
+       SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
+       IF( EXISTS ${KERNEL_ROOT_DIR} )
+         FIND_PACKAGE(SalomeKERNEL REQUIRED)
+       ELSE( EXISTS ${KERNEL_ROOT_DIR} )
+         MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR!")
+       ENDIF( EXISTS ${KERNEL_ROOT_DIR} )
+           
+       MESSAGE(STATUS "SalomeKERNEL_VERSION is ${SalomeKERNEL_VERSION}")
+
        SET(_all_SCRIPTS
            SinglePhase/SOLVERLAB_2DSphericalExplosion_HEXAGON.py
            )

diff --git a/CoreFlows/gui/salome/CMakeLists.txt b/CoreFlows/gui/salome/CMakeLists.txt
index 58bfcc3c9d74ce85dd534c9266c576c849e51d00..bc4df7f12c34e7f17b2f7786870dc16d36f7fa67 100755 (executable)
--- a/CoreFlows/gui/salome/CMakeLists.txt
+++ b/CoreFlows/gui/salome/CMakeLists.txt
@@ -17,6 +17,27 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+# Common CMake macros
+# ===================
+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 NO_POLICY_SCOPE)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
+                                                                                                       #
+# Find Salome KERNEL 
+# ==================
+SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
+IF( EXISTS ${KERNEL_ROOT_DIR} )
+  FIND_PACKAGE(SalomeKERNEL REQUIRED)
+ELSE( EXISTS ${KERNEL_ROOT_DIR} )
+  MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR!")
+ENDIF( EXISTS ${KERNEL_ROOT_DIR} )
+           
+MESSAGE(STATUS "SalomeKERNEL_VERSION is ${SalomeKERNEL_VERSION}")
+
 # Qt5
 FIND_PACKAGE(SalomeQt5 REQUIRED COMPONENTS QtCore QtGui)