diff --git a/CMakeLists.txt b/CMakeLists.txt index d7b5be5f75b8..a58881918c05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,9 @@ if(NOT "${CMAKE_VERSION}" VERSION_LESS "3.27") # include(Dart) still used, as is the "Experimental" target cmake_policy(SET CMP0145 OLD) endif() +if("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.31") + cmake_policy(SET CMP0177 NEW) +endif() # don't relink it only the shared object changes set(CMAKE_LINK_DEPENDS_NO_SHARED ON) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index c71d7f0453d1..c31cd1ac2deb 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -406,7 +406,7 @@ foreach(pyfile ${PY_FILES}) COMMAND ${CMAKE_COMMAND} -E make_directory "${QGIS_PYTHON_OUTPUT_DIRECTORY}" COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} "${QGIS_PYTHON_OUTPUT_DIRECTORY}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${pyfile} + # DEPENDS ${pyfile} ) PY_COMPILE(pyutils "${QGIS_PYTHON_OUTPUT_DIRECTORY}/${pyfile}") endforeach(pyfile) @@ -448,7 +448,7 @@ foreach(module ${PY_MODULES}) COMMAND ${CMAKE_COMMAND} -E make_directory "${QGIS_PYTHON_OUTPUT_DIRECTORY}/${subdir}" COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} "${QGIS_PYTHON_OUTPUT_DIRECTORY}/${subdir}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${PY_FILES} + # DEPENDS ${PY_FILES} ) endforeach(pyfile) PY_COMPILE(py${module} "${QGIS_PYTHON_OUTPUT_DIRECTORY}/${module_name}") diff --git a/python/console/CMakeLists.txt b/python/console/CMakeLists.txt index acc73efef53a..65bdd2c4fd39 100644 --- a/python/console/CMakeLists.txt +++ b/python/console/CMakeLists.txt @@ -26,14 +26,14 @@ add_custom_command(TARGET pyconsole POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${UI_FILES} ${PYTHON_OUTPUT_DIRECTORY}/console WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${UI_FILES} + # DEPENDS ${UI_FILES} ) foreach(pyfile ${PY_CONSOLE_FILES}) add_custom_command(TARGET pyconsole POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} ${PYTHON_OUTPUT_DIRECTORY}/console WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${pyfile} + # DEPENDS ${pyfile} ) endforeach(pyfile) PY_COMPILE(pyconsole "${PYTHON_OUTPUT_DIRECTORY}/console") diff --git a/python/plugins/CMakeLists.txt b/python/plugins/CMakeLists.txt index 435f2f8227f2..f6a77d391c03 100644 --- a/python/plugins/CMakeLists.txt +++ b/python/plugins/CMakeLists.txt @@ -24,7 +24,7 @@ macro (PLUGIN_INSTALL plugin subdir ) add_dependencies(zzz-${plugin}-stageinstall zzz-${plugin}-depend) add_custom_command(TARGET zzz-${plugin}-stageinstall - COMMAND ${CMAKE_COMMAND} -P ${_cmake} + POST_BUILD COMMAND ${CMAKE_COMMAND} -P ${_cmake} ) add_custom_target(clean-staged-${plugin} diff --git a/python/processing/CMakeLists.txt b/python/processing/CMakeLists.txt index 167a7be08a19..81cd0be4a942 100644 --- a/python/processing/CMakeLists.txt +++ b/python/processing/CMakeLists.txt @@ -17,7 +17,7 @@ foreach(pyfile ${PY_FILES}) POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} "${QGIS_PYTHON_OUTPUT_DIRECTORY}/processing" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${pyfile} + # DEPENDS ${pyfile} ) PY_COMPILE(pyutils "${QGIS_PYTHON_OUTPUT_DIRECTORY}/processing/${pyfile}") endforeach(pyfile) diff --git a/python/pyplugin_installer/CMakeLists.txt b/python/pyplugin_installer/CMakeLists.txt index 310ed51b3e93..9d84f8ec4804 100644 --- a/python/pyplugin_installer/CMakeLists.txt +++ b/python/pyplugin_installer/CMakeLists.txt @@ -33,7 +33,7 @@ add_custom_command(TARGET pyplugin-installer POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${UI_FILES} ${PYTHON_OUTPUT_DIRECTORY}/pyplugin_installer WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${UI_FILES} + # DEPENDS ${UI_FILES} ) foreach(pyfile ${PY_PLUGININSTALLER_FILES}) @@ -41,7 +41,7 @@ foreach(pyfile ${PY_PLUGININSTALLER_FILES}) POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} ${PYTHON_OUTPUT_DIRECTORY}/pyplugin_installer WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${pyfile} + # DEPENDS ${pyfile} ) endforeach(pyfile) PY_COMPILE(pyplugin-installer "${PYTHON_OUTPUT_DIRECTORY}/pyplugin_installer") diff --git a/python/testing/CMakeLists.txt b/python/testing/CMakeLists.txt index 684d6e37473b..c428e5e93594 100644 --- a/python/testing/CMakeLists.txt +++ b/python/testing/CMakeLists.txt @@ -19,7 +19,7 @@ foreach(pyfile ${PY_FILES}) POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} "${QGIS_PYTHON_OUTPUT_DIRECTORY}/testing" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${pyfile} + # DEPENDS ${pyfile} ) PY_COMPILE(pyutils "${QGIS_PYTHON_OUTPUT_DIRECTORY}/testing/${pyfile}") endforeach(pyfile)