ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-27 18:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Use WIN32 CMake variable instead deprecated WINDOWS variable.

Browse Source
This commit is contained in:
rnv 2013-10-24 12:03:15 +00:00
parent f7a3186af6
commit 7cf5e26857
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Tools/Verima/Doc/CMakeLists.txt
View File

@ -45,7 +45,7 @@ SALOME_CONFIGURE_FILE(conf.py.in conf.py)
# Their root dir were found when looking for Sphinx (FindSalomeSphinx.cmake): # Their root dir were found when looking for Sphinx (FindSalomeSphinx.cmake):
SET(_pydir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) 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% STRING(REPLACE "/" "\\" SCR "@SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\lib\\${_pydir}\\site-packages\\salome\;%PYTHONPATH%
@SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\bin\\salome\;%PYTHONPATH% @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\bin\\salome\;%PYTHONPATH%
@SET PATH=${CMAKE_INSTALL_PREFIX}\\lib\\salome\;%PATH% @SET PATH=${CMAKE_INSTALL_PREFIX}\\lib\\salome\;%PATH%
@ -65,7 +65,7 @@ IF(WINDOWS)
") ")
SET(EXT "bat") SET(EXT "bat")
SET(CALL_STR "call") SET(CALL_STR "call")
ELSE(WINDOWS) ELSE(WIN32)
SET(SCR " export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/${_pydir}/site-packages/salome:\${PYTHONPATH} SET(SCR " export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/${_pydir}/site-packages/salome:\${PYTHONPATH}
export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/bin/salome:\${PYTHONPATH} export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/bin/salome:\${PYTHONPATH}
export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib/salome:\${LD_LIBRARY_PATH} export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib/salome:\${LD_LIBRARY_PATH}
@ -93,7 +93,7 @@ ELSE(WINDOWS)
) )
SET(EXT "sh") SET(EXT "sh")
SET(CALL_STR ".") SET(CALL_STR ".")
ENDIF(WINDOWS) ENDIF(WIN32)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}") FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}")

5
src/Tools/padder/CMakeLists.txt
View File

@ -16,8 +16,9 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
IF(SALOME_BUILD_DOC)
ADD_SUBDIRECTORY(doc) ADD_SUBDIRECTORY(doc)
ENDIF(SALOME_BUILD_DOC)
ADD_SUBDIRECTORY(meshjob) ADD_SUBDIRECTORY(meshjob)
ADD_SUBDIRECTORY(resources) ADD_SUBDIRECTORY(resources)
ADD_SUBDIRECTORY(spadderpy) ADD_SUBDIRECTORY(spadderpy)