CMake: IF(WINDOWS) is deprecated - please always use IF(WIN32)

diff --git a/src/GLViewer/CMakeLists.txt b/src/GLViewer/CMakeLists.txt
index 20d2120686b0c515788b2d5c75b6f1c086c18056..430750130b9ea849dcc9a15fd0d4c2c73a7a704d 100755 (executable)
--- a/src/GLViewer/CMakeLists.txt
+++ b/src/GLViewer/CMakeLists.txt
@@ -33,7 +33,7 @@ ADD_DEFINITIONS(${CAS_DEFINITIONS} ${QT_DEFINITIONS})
 
 # libraries to link to
 SET(_link_LIBRARIES ${QT_LIBRARIES} ${CAS_KERNEL} ${OPENGL_LIBRARIES} qtx suit)
-IF(NOT WINDOWS)
+IF(NOT WIN32)
   LIST(APPEND _link_LIBRARIES Xmu)
 ENDIF()
 

diff --git a/src/LightApp/CMakeLists.txt b/src/LightApp/CMakeLists.txt
index 8a6c080b382917e52a8decc49b6aad5b4d7494cf..94122a0f225177ac60f735af8631a3dd46cc4bb4 100755 (executable)
--- a/src/LightApp/CMakeLists.txt
+++ b/src/LightApp/CMakeLists.txt
@@ -79,7 +79,7 @@ ENDIF()
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${HDF5_DEFINITIONS})
-IF(NOT WINDOWS)
+IF(NOT WIN32)
   ADD_DEFINITIONS("-Wno-deprecated")
 ENDIF()
 IF(NOT SALOME_USE_SALOMEOBJECT)

diff --git a/src/SALOME_PY/CMakeLists.txt b/src/SALOME_PY/CMakeLists.txt
index 5b2a8a26b2d748ed88452ce51ea80bfc8dbad391..61b8fa7575e995fc80d94f1e4e51cc3d8c5b45e8 100755 (executable)
--- a/src/SALOME_PY/CMakeLists.txt
+++ b/src/SALOME_PY/CMakeLists.txt
@@ -60,8 +60,8 @@ TARGET_LINK_LIBRARIES(SalomePy ${_link_LIBRARIES})
 INSTALL(TARGETS SalomePy DESTINATION ${SALOME_INSTALL_LIBS})
 
 # TODO: check on windows
-IF(WINDOWS)
+IF(WIN32)
   SET_TARGET_PROPERTIES(SalomePy PROPERTIES PREFIX "lib" SUFFIX ".pyd" DEBUG_OUTPUT_NAME SalomePy_d RELEASE_OUTPUT_NAME SalomePy)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 # TODO: check if PYTHON_ADD_MODULE() macro can be used to build this target
\ No newline at end of file

diff --git a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
index 9bc8d9a01d39810bbf9f34bd060c65cc03cd7137..20f066392dc1437a99747a47efa9c17c0a2cf6f5 100755 (executable)
--- a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
+++ b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
@@ -94,7 +94,7 @@ ADD_LIBRARY(SalomePyQt ${SalomePyQt_SOURCES})
 TARGET_LINK_LIBRARIES(SalomePyQt ${_link_LIBRARIES})
 INSTALL(TARGETS SalomePyQt DESTINATION ${SALOME_INSTALL_LIBS})
 
-IF(WINDOWS)
+IF(WIN32)
   SET_TARGET_PROPERTIES(SalomePyQt PROPERTIES SUFFIX ".pyd" DEBUG_OUTPUT_NAME SalomePyQt_d RELEASE_OUTPUT_NAME SalomePyQt)
 ELSE()
   SET_TARGET_PROPERTIES(SalomePyQt PROPERTIES PREFIX "")

diff --git a/src/SALOME_SWIG/CMakeLists.txt b/src/SALOME_SWIG/CMakeLists.txt
index 29e37ffdc15b62eb14899e01471f4e7fa0ff49e5..42c824acd503154721264952dad6c4ac4ddee65c 100755 (executable)
--- a/src/SALOME_SWIG/CMakeLists.txt
+++ b/src/SALOME_SWIG/CMakeLists.txt
@@ -82,9 +82,9 @@ SET(_other_SCRIPTS
 
 SWIG_ADD_MODULE(libSALOME_Swig python libSALOME_Swig.i SALOMEGUI_Swig.cxx)
 SWIG_LINK_LIBRARIES(libSALOME_Swig ${PYTHON_LIBRARIES} LightApp)
-IF(WINDOWS)
+IF(WIN32)
   SET_TARGET_PROPERTIES(_libSALOME_Swig PROPERTIES DEBUG_OUTPUT_NAME _libSALOME_Swig_d)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 INSTALL(TARGETS _libSALOME_Swig DESTINATION ${SALOME_INSTALL_PYTHON})