From 765df3a92131276064c2d6bb5c31e6123bf8cf52 Mon Sep 17 00:00:00 2001 From: ana Date: Mon, 25 Jul 2016 17:04:50 +0300 Subject: [PATCH] Windows: suppress Cmake warnings --- CMakeLists.txt | 3 +++ doc/CMakeLists.txt | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a7adfc..7384fec 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,9 @@ PROJECT(SalomeHELLO 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/CMakeLists.txt b/doc/CMakeLists.txt index 7a83d71..19d98d1 100755 --- a/doc/CMakeLists.txt +++ b/doc/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}/HELLO DESTINATION ${SALOME_INSTALL_DOC}/gui) INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HELLO) -- 2.39.2