From: michael <michael@localhost.localdomain>
Date: Thu, 22 Apr 2021 10:52:55 +0000 (+0200)
Subject: Moved SalomeGUI detection to folder gui/salome
X-Git-Tag: V9_7_0~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3f10f03ed2365b601c490e58ced83742a828306f;p=tools%2Fsolverlab.git

Moved SalomeGUI detection to folder gui/salome
---

diff --git a/CoreFlows/CMakeLists.txt b/CoreFlows/CMakeLists.txt
index c517df2..80d0ccb 100755
--- a/CoreFlows/CMakeLists.txt
+++ b/CoreFlows/CMakeLists.txt
@@ -86,32 +86,6 @@ endif(COREFLOWS_WITH_GUI)
 													    #
 # ------------- --------------------------------------------------------------------------------------------#
 
-# Salome Graphic interface---------------------------------------------------------------------------------------------#
-														#
-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 GUI 
-	# ==============
-	SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
-	IF(EXISTS ${GUI_ROOT_DIR})
-	  FIND_PACKAGE(SalomeGUI)
-	ELSE(EXISTS ${GUI_ROOT_DIR})
-	  MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR!")
-	ENDIF(EXISTS ${GUI_ROOT_DIR})
-	
-endif( (EXISTS $ENV{CONFIGURATION_ROOT_DIR}) AND (EXISTS $ENV{KERNEL_ROOT_DIR}) AND (EXISTS $ENV{GUI_ROOT_DIR}) )                                                                                                        #
-#---------------------------------------------------------------------------------------------------------------#
-
 #--------------------- COMPILATION MAIN --------------------------------------------------------------------#
 													    #
 INCLUDE_DIRECTORIES(						   					    #
diff --git a/CoreFlows/gui/salome/CMakeLists.txt b/CoreFlows/gui/salome/CMakeLists.txt
index bc4df7f..20c4150 100755
--- a/CoreFlows/gui/salome/CMakeLists.txt
+++ b/CoreFlows/gui/salome/CMakeLists.txt
@@ -38,6 +38,15 @@ ENDIF( EXISTS ${KERNEL_ROOT_DIR} )
 	    
 MESSAGE(STATUS "SalomeKERNEL_VERSION is ${SalomeKERNEL_VERSION}")
 
+# Find SALOME GUI 
+# ==============
+SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
+IF(EXISTS ${GUI_ROOT_DIR})
+  FIND_PACKAGE(SalomeGUI)
+ELSE(EXISTS ${GUI_ROOT_DIR})
+  MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR!")
+ENDIF(EXISTS ${GUI_ROOT_DIR})
+	
 # Qt5
 FIND_PACKAGE(SalomeQt5 REQUIRED COMPONENTS QtCore QtGui)