Windows compatibility.

diff --git a/cmake/FindCAS.cmake b/cmake/FindCAS.cmake
index 1b7c6b8c5d672be4ca5e90ce541b624f6febf72e..bce1609c9ed37622ee7c175d11a2660e732bd494 100644 (file)
--- a/cmake/FindCAS.cmake
+++ b/cmake/FindCAS.cmake
@@ -87,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)
@@ -222,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")

diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake
index 593e4c4362d21bb287e65490739e1644ee5b9a54..bb47768bf5ace99f73ea6bfd27bcee66f81d0ffb 100644 (file)
--- a/cmake/FindPyQt5.cmake
+++ b/cmake/FindPyQt5.cmake
@@ -88,8 +88,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PyQt5 REQUIRED_VARS PYQT_PYUIC_EXECUTABLE PYQT
 # TODO: should be done like Sphinx in KERNEL (i.e. generating a shell script)?
 
 IF(WIN32 AND NOT CYGWIN)
-  SET(PYQT_PYUIC_PATH set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYQT_PYUIC_EXECUTABLE})
-  SET(PYQT_PYRCC_PATH set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYQT_PYRCC_EXECUTABLE})
+  SET(PYQT_PYUIC_PATH set PYTHONPATH=${PYQT_PYTHONPATH}\\\;${SIP_PYTHONPATH}\\\;%PYTHONPATH% && ${PYQT_PYUIC_EXECUTABLE})
+  SET(PYQT_PYRCC_PATH set PYTHONPATH=${PYQT_PYTHONPATH}\\\;${SIP_PYTHONPATH}\\\;%PYTHONPATH% && ${PYQT_PYRCC_EXECUTABLE})
 ELSE()
   STRING(REPLACE ";" ":" PYQT_PYTHONPATH "${PYQT_PYTHONPATH}")
   SET(PYQT_PYUIC_PATH /usr/bin/env PYTHONPATH="${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:$$PYTHONPATH" ${PYQT_PYUIC_EXECUTABLE})

diff --git a/cmake/FindSalomeCAS.cmake b/cmake/FindSalomeCAS.cmake
index 45e68e75ec7e6a3899959e3ae9f80fa2d9f49408..94f93710a053f53ef9aadb4af70f11ef75a84fd4 100755 (executable)
--- a/cmake/FindSalomeCAS.cmake
+++ b/cmake/FindSalomeCAS.cmake
@@ -42,6 +42,7 @@ IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
   MARK_AS_ADVANCED(CAS_FWOSPlugin)
 ELSE()
   MARK_AS_ADVANCED(CAS_TKStd)
+  MARK_AS_ADVANCED(CAS_TKStdL)
 ENDIF()
 
 IF(CAS_VERSION_STR VERSION_LESS "7.0")