From 1145e9a81e7d69f285bf6302a9951d68747c335b Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 24 Oct 2013 08:09:52 +0000 Subject: [PATCH] Suppress using deprecated WINDOWS CMake variable. Use WIN32 instead. --- src/MEDOP/doc/sphinx/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MEDOP/doc/sphinx/CMakeLists.txt b/src/MEDOP/doc/sphinx/CMakeLists.txt index 6452a7d68..a492ac45a 100644 --- a/src/MEDOP/doc/sphinx/CMakeLists.txt +++ b/src/MEDOP/doc/sphinx/CMakeLists.txt @@ -41,7 +41,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% @@ -61,7 +61,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} @@ -89,7 +89,7 @@ ELSE(WINDOWS) ) SET(EXT "sh") SET(CALL_STR ".") -ENDIF(WINDOWS) +ENDIF(WIN32) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}") -- 2.39.2