maj

[modules/shaper.git] / CMakeCommon / FindSalome.cmake

diff --git a/CMakeCommon/FindSalome.cmake b/CMakeCommon/FindSalome.cmake
index 891a363ebf42c6b7cffedcac92bd8278f22df8c3..3eb57035b2fa456e39e8462af6e580e2cd19874f 100644 (file)
--- a/CMakeCommon/FindSalome.cmake
+++ b/CMakeCommon/FindSalome.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2021  CEA/DEN, EDF R&D
+# Copyright (C) 2014-2022  CEA/DEN, 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
@@ -17,13 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL directory")
-SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI directory")
-SET(HAVE_SALOME NO)
-IF(EXISTS ${GUI_ROOT_DIR})
-       MESSAGE("-- SALOME found at " ${GUI_ROOT_DIR})
-       SET(HAVE_SALOME YES)
-
+IF(${HAVE_SALOME})
        FIND_LIBRARY(caf caf ${GUI_ROOT_DIR}/lib/salome)
        FIND_LIBRARY(CAM CAM ${GUI_ROOT_DIR}/lib/salome)
        FIND_LIBRARY(CASCatch CASCatch ${GUI_ROOT_DIR}/lib/salome)
@@ -65,9 +59,4 @@ IF(EXISTS ${GUI_ROOT_DIR})
        FIND_LIBRARY(vtkTools vtkTools ${GUI_ROOT_DIR}/lib/salome)
        FIND_LIBRARY(SalomeGuiHelpers SalomeGuiHelpers ${GUI_ROOT_DIR}/lib/salome)
        FIND_LIBRARY(SalomeTreeData SalomeTreeData ${GUI_ROOT_DIR}/lib/salome)
-
-       SET(SALOME_GUI_INCLUDE ${GUI_ROOT_DIR}/include/salome)
-       SET(SALOME_KERNEL_INCLUDE ${KERNEL_ROOT_DIR}/include/salome)
-        SET(SALOME_KERNEL_LIBDIR ${KERNEL_ROOT_DIR}/lib/salome)
-       ADD_DEFINITIONS( -DHAVE_SALOME )
-ENDIF(EXISTS ${GUI_ROOT_DIR})
+ENDIF()