Copyright update 2022

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

diff --git a/cmake/FindCAS.cmake b/cmake/FindCAS.cmake
index dc46f0c10891a95b7c0d518b676048e7f7acdb5c..ed65bc1a5747f57e9823d6a5a8880bd1fe77788e 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-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
@@ -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")
@@ -84,6 +87,7 @@ 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)
@@ -219,6 +223,7 @@ 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")