Use WIN32 CMake variable instead deprecated WINDOWS variable.

diff --git a/src/Tools/Verima/Doc/CMakeLists.txt b/src/Tools/Verima/Doc/CMakeLists.txt
index 9ba44a6466fe52c67f7ee98cea387f658a4a96fd..e2b7b51c18b4039792cb448e5a9167290cf57cef 100755 (executable)
--- a/src/Tools/Verima/Doc/CMakeLists.txt
+++ b/src/Tools/Verima/Doc/CMakeLists.txt
@@ -45,7 +45,7 @@ SALOME_CONFIGURE_FILE(conf.py.in conf.py)
 #    Their root dir were found when looking for Sphinx (FindSalomeSphinx.cmake):
 
 SET(_pydir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-IF(WINDOWS)
+IF(WIN32)
   STRING(REPLACE "/" "\\" SCR "@SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\lib\\${_pydir}\\site-packages\\salome\;%PYTHONPATH%
   @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\bin\\salome\;%PYTHONPATH%
   @SET PATH=${CMAKE_INSTALL_PREFIX}\\lib\\salome\;%PATH%
@@ -65,7 +65,7 @@ IF(WINDOWS)
   ")
   SET(EXT "bat")
   SET(CALL_STR "call")
-ELSE(WINDOWS)
+ELSE(WIN32)
   SET(SCR  " export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/${_pydir}/site-packages/salome:\${PYTHONPATH}
   export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/bin/salome:\${PYTHONPATH}
   export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib/salome:\${LD_LIBRARY_PATH}
@@ -93,7 +93,7 @@ ELSE(WINDOWS)
   )
   SET(EXT "sh")
   SET(CALL_STR ".")
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}")
 

diff --git a/src/Tools/padder/CMakeLists.txt b/src/Tools/padder/CMakeLists.txt
index 082320ed7b8f3c382ec227ad137846acfa2cc689..50c6f288b886e132d272dacfc5fcd38df4bed9b3 100644 (file)
--- a/src/Tools/padder/CMakeLists.txt
+++ b/src/Tools/padder/CMakeLists.txt
@@ -16,8 +16,9 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-
-ADD_SUBDIRECTORY(doc)
+IF(SALOME_BUILD_DOC)
+  ADD_SUBDIRECTORY(doc)
+ENDIF(SALOME_BUILD_DOC)
 ADD_SUBDIRECTORY(meshjob)
 ADD_SUBDIRECTORY(resources)
 ADD_SUBDIRECTORY(spadderpy)