Copyright update 2022

[tools/configuration.git] / cmake / FindSalomeOpenCASCADE.cmake

diff --git a/cmake/FindSalomeOpenCASCADE.cmake b/cmake/FindSalomeOpenCASCADE.cmake
index 684f4a24c9fe7f1a796d16de324f76eff4de108a..3bc42d26046569af554e459408218fe4771bfcce 100644 (file)
--- a/cmake/FindSalomeOpenCASCADE.cmake
+++ b/cmake/FindSalomeOpenCASCADE.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,11 @@
 #
 
 # TODO: RNV: Check different OCCT layouts !!!
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCASCADE OpenCASCADE_INCLUDE_DIR 2)
+IF(WIN32)
+  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCASCADE OpenCASCADE_INCLUDE_DIR 1)
+ELSE()
+  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCASCADE OpenCASCADE_INCLUDE_DIR 2)
+ENDIF()
 
 IF(OpenCASCADE_FOUND)
   
@@ -39,6 +43,16 @@ IF(OpenCASCADE_FOUND)
 
   SALOME_ACCUMULATE_HEADERS(OpenCASCADE_INCLUDE_DIR)
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OpenCASCADE_LIBRARY_DIR})
+  IF(WIN32)
+    # RNV: Fix bug with OCCT CMake build procedure:
+    #      In Debug ${OpenCASCADE_BINARY_DIR} and ${OpenCASCADE_LIBRARY_DIR} are stored in the
+    #      config file w/o "d" suffix. To be checked with latest version of OCCT.
+    SET(SUFF "")
+    IF(${OpenCASCADE_BUILD_WITH_DEBUG})
+      SET(SUFF "d")
+    ENDIF()
+    SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OpenCASCADE_BINARY_DIR}${SUFF})
+  ENDIF()
 
 ELSE()
   # TODO: Detect OpenCASCADE if it is distributed without CMake configuration.