Copyright update 2021

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

diff --git a/cmake/FindCAS.cmake b/cmake/FindCAS.cmake
index ce24f3d589e15e7fdadd2b047cb8c1f24f0f1335..93ce75512c2898aab5c68eb1e693e1bf5c8fd46b 100644 (file)
--- a/cmake/FindCAS.cmake
+++ b/cmake/FindCAS.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2021  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
@@ -52,9 +52,9 @@ ENDIF()
 # Win specific stuff:
 IF(WIN32)
   IF(CMAKE_BUILD_TYPE STREQUAL Debug)
-    SET(CMAKE_LIBRARY_PATH ${CAS_ROOT_DIR}/win32/libd)
+    SET(CMAKE_LIBRARY_PATH ${CAS_ROOT_DIR}/win32/libd ${CAS_ROOT_DIR}/win64/lib/vc10)
   ELSE()
-    SET(CMAKE_LIBRARY_PATH ${CAS_ROOT_DIR}/win32/lib)
+    SET(CMAKE_LIBRARY_PATH ${CAS_ROOT_DIR}/win32/lib ${CAS_ROOT_DIR}/win64/lib/vc10)
   ENDIF()
 ENDIF()
 
@@ -62,11 +62,14 @@ ENDIF()
 SET(CAS_DEFINITIONS "-DLIN -DLINTEL -DCSFDB")
 SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DNo_exception")
 
-# No config.h file in the OPEN CASCADE on WINDOWS platform 
-IF(NOT WIN32)
+# Check config.h file
+FIND_FILE(CAS_CONFIG_H config.h PATHS ${CAS_INCLUDE_DIRS} NO_DEFAULT_PATH)
+IF(CAS_CONFIG_H)
  SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H")
 ENDIF()
 
+SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DOCC_CONVERT_SIGNALS")
+
 # Test for 64 bit machine:
 IF(CMAKE_SIZEOF_VOID_P STREQUAL 8)
   SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -D_OCC64")
@@ -80,7 +83,12 @@ IF(NOT WIN32)
   ENDIF()
 ENDIF()
 
-FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin PATH_SUFFIXES lib lin64/gcc/lib bin)
+IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
+  FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin PATH_SUFFIXES lib lin64/gcc/lib bin)
+ELSE()
+  FIND_LIBRARY(CAS_TKStd TKStd PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKStdL TKStdL PATH_SUFFIXES lib lin64/gcc/lib bin)
+ENDIF()
 FIND_LIBRARY(CAS_TKBin TKBin PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKBinL TKBinL PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKBinTObj TKBinTObj PATH_SUFFIXES lib lin64/gcc/lib bin)
@@ -164,7 +172,6 @@ SET(CAS_TKSTL ${CAS_TKSTL_EA})
 SET(CAS_TKCAF ${CAS_TKCAF_EA})
 
 SET(_libs
-  CAS_FWOSPlugin
   CAS_TKBin
   CAS_TKBinL
   CAS_TKBinTObj
@@ -212,6 +219,13 @@ SET(_libs
   CAS_TKXSBase
 )
 
+IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
+  LIST(APPEND _libs CAS_FWOSPlugin)
+ELSE()
+  LIST(APPEND _libs CAS_TKStd)
+  LIST(APPEND _libs CAS_TKStdL)
+ENDIF()
+
 IF(CAS_VERSION_STR VERSION_LESS "6.9.1")
   LIST(APPEND _libs CAS_TKNIS)
 ENDIF()