Build under Windows with ParaView-5.9.0 and sip-5.5.0

diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake
index 498e322c3ee67a1371a5d6dfce7f736235cf3b5a..48927aa09d8dfb943ed42b6c02fd696fb14d5609 100644 (file)
--- a/cmake/FindSIP.cmake
+++ b/cmake/FindSIP.cmake
@@ -37,13 +37,17 @@ ENDIF()
 FIND_PROGRAM(SIP_EXECUTABLE
              NAMES sip5 sip4 sip
              HINTS $ENV{SIP_ROOT_DIR}
-             PATH_SUFFIXES bin)
+             PATH_SUFFIXES bin Scripts)
 
 IF(SIP_EXECUTABLE)
   # Set path to sip's Python module
   GET_FILENAME_COMPONENT(SIP_PYTHONPATH "${SIP_EXECUTABLE}" PATH) # <root>/bin/sip -> <root>/bin
   GET_FILENAME_COMPONENT(SIP_PYTHONPATH "${SIP_PYTHONPATH}" PATH) # <root>/bin -> <root>
-  SET(SIP_PYTHONPATH "${SIP_PYTHONPATH}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
+  IF(WIN32)
+    SET(SIP_PYTHONPATH "${SIP_PYTHONPATH}/lib/site-packages")
+  ELSE()
+    SET(SIP_PYTHONPATH "${SIP_PYTHONPATH}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
+  ENDIF()
 
   # Detect sip version
   EXECUTE_PROCESS(COMMAND ${SIP_EXECUTABLE} "-V"
@@ -57,7 +61,7 @@ IF(SIP_VERSION AND SIP_VERSION VERSION_GREATER_EQUAL "5")
   FIND_PROGRAM(SIP_MODULE_EXECUTABLE
                NAMES sip-module
                HINTS $ENV{SIP_ROOT_DIR}
-               PATH_SUFFIXES bin)
+               PATH_SUFFIXES bin Scripts)
 ENDIF()
 
 # Find header file (only for version < 5)

diff --git a/cmake/FindSalomeVTK.cmake b/cmake/FindSalomeVTK.cmake
index 6fd144526c2298ea79774f7772c7f4cf3f1110c2..32f72140b47f9b6a3a325555e693e1badb49bfb9 100644 (file)
--- a/cmake/FindSalomeVTK.cmake
+++ b/cmake/FindSalomeVTK.cmake
@@ -37,6 +37,7 @@ SET(SalomeVTK_COMPONENTS
   InteractionWidgets
   InfovisCore
   InteractionStyle
+  CommonSystem
 )
 
 #   Seting the following variable is equivalent to having passed the components