Salome HOME
Windows: suppress Cmake warnings
authorana <ana@opencascade.com>
Mon, 25 Jul 2016 14:07:50 +0000 (17:07 +0300)
committerana <ana@opencascade.com>
Mon, 25 Jul 2016 14:07:50 +0000 (17:07 +0300)
CMakeLists.txt
doc/salome/gui/SMESH/CMakeLists.txt

index d5381f6..cd8078e 100755 (executable)
@@ -21,6 +21,9 @@ PROJECT(SalomeSMESH 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
 # ===========
index 2060a5b..9479329 100644 (file)
@@ -48,8 +48,6 @@ ADD_CUSTOM_TARGET(usr_docs ${CMAKE_COMMAND} -E make_directory tmp1
   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}/SMESH DESTINATION ${SALOME_INSTALL_DOC}/gui)
 INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/SMESH)