Salome HOME
Windows compatibility.
authorana <ana@opencascade.com>
Thu, 24 Nov 2016 11:22:27 +0000 (14:22 +0300)
committerana <ana@opencascade.com>
Thu, 24 Nov 2016 11:22:27 +0000 (14:22 +0300)
cmake/FindCAS.cmake
cmake/FindSalomeVTK.cmake

index e659b558beb55e6c72088e29d01c20f959b10494..422aef68d732b5ed12689b9a28abebc1f9600673 100644 (file)
@@ -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()
 
index 1f3ba17711ec01db14f7702e2c16fcb2c2e656c9..cef9d0d27b1b9face8f1b3701231cc2666398b29 100644 (file)
@@ -37,6 +37,7 @@ SET(SalomeVTK_COMPONENTS
   vtkRenderingLabel
   vtkInteractionWidgets
   vtkInfovisCore
+  vtkInteractionStyle
 )
 
 #   Seting the following variable is equivalent to having passed the components