From 373ab99b40d7ee6794c0bab1ec3cd52b523ed660 Mon Sep 17 00:00:00 2001
From: ana <ana@opencascade.com>
Date: Mon, 25 Jul 2016 17:04:37 +0300
Subject: [PATCH] Windows: suppress Cmake warnings

---
 CMakeLists.txt                      | 3 +++
 adm_local/cmake_files/UsePyQt.cmake | 3 ++-
 doc/salome/gui/CMakeLists.txt       | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a9a15cdc..1ef75e6b8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,9 @@ PROJECT(SalomeGUI C CXX)
 
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
+IF(WIN32)
+  CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib 
+ENDIF(WIN32)
 
 # Versioning
 # ===========
diff --git a/adm_local/cmake_files/UsePyQt.cmake b/adm_local/cmake_files/UsePyQt.cmake
index 1c07ecd5c..587aef25a 100644
--- a/adm_local/cmake_files/UsePyQt.cmake
+++ b/adm_local/cmake_files/UsePyQt.cmake
@@ -95,6 +95,7 @@ MACRO(PYQT_WRAP_UIC outfiles)
   SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
   _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _uniqueTargetName)
   ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL)
+  SET_TARGET_PROPERTIES(${_uniqueTargetName} PROPERTIES FOLDER PYQT_WRAP_UIC_TARGETS)
   FOREACH(_input ${ARGN})
     GET_FILENAME_COMPONENT(_input_name ${_input} NAME)
     STRING(REPLACE ".ui" "_ui.py" _input_name ${_input_name})
@@ -104,7 +105,7 @@ MACRO(PYQT_WRAP_UIC outfiles)
       DEPENDS ${_input}
       )
     SET_TARGET_PROPERTIES(${_TgName} PROPERTIES FOLDER PYQT_WRAP_UIC_TARGETS)
-    ADD_DEPENDENCIES(${_uniqueTargetName} DEPEND ${_TgName})
+    ADD_DEPENDENCIES(${_uniqueTargetName} ${_TgName})
     SET(${outfiles} ${${outfiles}} ${_output})
   ENDFOREACH()
  ENDIF(NOT WIN32)
diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt
index aba6661e2..92e077bda 100755
--- a/doc/salome/gui/CMakeLists.txt
+++ b/doc/salome/gui/CMakeLists.txt
@@ -25,8 +25,6 @@ SALOME_CONFIGURE_FILE(static/header.html.in static/header.html)
                 
 ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE})
 
-ADD_DEPENDENCIES(usr_docs html_docs)
-
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)")
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GUI DESTINATION ${SALOME_INSTALL_DOC}/gui)
 INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GUI) 
-- 
2.39.2