From f2e2cc75958b145b1f04e660c016ccb42faeca25 Mon Sep 17 00:00:00 2001 From: bruneton Date: Wed, 18 Sep 2013 09:16:45 +0000 Subject: [PATCH] CMake: IF(WINDOWS) is deprecated - please always use IF(WIN32) --- src/GLViewer/CMakeLists.txt | 2 +- src/LightApp/CMakeLists.txt | 2 +- src/SALOME_PY/CMakeLists.txt | 4 ++-- src/SALOME_PYQT/SalomePyQt/CMakeLists.txt | 2 +- src/SALOME_SWIG/CMakeLists.txt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/GLViewer/CMakeLists.txt b/src/GLViewer/CMakeLists.txt index 20d212068..430750130 100755 --- 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 8a6c080b3..94122a0f2 100755 --- 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 5b2a8a26b..61b8fa757 100755 --- 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 9bc8d9a01..20f066392 100755 --- 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 29e37ffdc..42c824acd 100755 --- 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}) -- 2.30.2