Windows: suppress Cmake warnings

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61cd8e78709bce8d44bf4c889a0e9faa988101ea..cf0c94e68a41b9f8176f5968810c902d1f56d72f 100755 (executable)
--- 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 284495f14c5cc5f7d96da581cbf85088440864de..a0defdbfda8221d261deeed94566403f680836a0 100644 (file)
--- 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)