From: ana <ana@opencascade.com>
Date: Mon, 25 Jul 2016 14:03:46 +0000 (+0300)
Subject: Windows: suppress Cmake warnings
X-Git-Tag: V8_1_0b1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6d27d7bc8643e0d9e2e38155c1c10a274caa9d6e;p=modules%2Fgeom.git

Windows: suppress Cmake warnings
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61cd8e787..cf0c94e68 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,9 @@ PROJECT(SalomeGEOM 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/doc/salome/gui/GEOM/CMakeLists.txt b/doc/salome/gui/GEOM/CMakeLists.txt
index 284495f14..a0defdbfd 100644
--- a/doc/salome/gui/GEOM/CMakeLists.txt
+++ b/doc/salome/gui/GEOM/CMakeLists.txt
@@ -59,8 +59,6 @@ ADD_CUSTOM_TARGET(usr_docs ${CMAKE_COMMAND} -E make_directory tmp
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-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}/GEOM DESTINATION ${SALOME_INSTALL_DOC}/gui)
 INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GEOM)