From 03b7ce2ab60b8951f1e9f747f2b6121aa5137ce1 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sun, 23 May 2021 20:38:44 +0200 Subject: fix:build:cmake:fix in-tree cmake build circular dependency warnings (#1122) Only copy files when SOURCE and DESTINATION directory differs. No need to copy files into themselves when doing in-tree build. Removes annoying warning. ``` make[2]: Circular navit/textures/diagonal-stripes.svg <- navit/textures/diagonal-stripes.svg dependency dropped. ``` Signed-off-by: David Heidelberg --- navit/icons/CMakeLists.txt | 2 ++ navit/textures/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/navit/icons/CMakeLists.txt b/navit/icons/CMakeLists.txt index 548bef441..ec00ac9a4 100644 --- a/navit/icons/CMakeLists.txt +++ b/navit/icons/CMakeLists.txt @@ -127,6 +127,7 @@ foreach (IMAGE_SRC ${FILES_TO_PNG}) endforeach() +if (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} ) foreach (IMAGE_FILE ${IMAGES_TO_COPY}) add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}" DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_FILE}" @@ -135,6 +136,7 @@ foreach (IMAGE_FILE ${IMAGES_TO_COPY}) ) list(APPEND IMAGE_TARGETS "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}") endforeach() +endif() add_custom_target(images ALL DEPENDS ${IMAGE_TARGETS}) add_custom_target(images_resource COMMAND mkdir -p ../resources/share/navit/xpm COMMAND cp ${IMAGE_TARGETS} ../resources/share/navit/xpm) diff --git a/navit/textures/CMakeLists.txt b/navit/textures/CMakeLists.txt index 5cd70205f..b59a0a17f 100644 --- a/navit/textures/CMakeLists.txt +++ b/navit/textures/CMakeLists.txt @@ -110,6 +110,7 @@ foreach (TEXTURE_SRC ${FILES_TO_PNG}) endforeach() +if (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} ) foreach (TEXTURE_FILE ${TEXTURES_TO_COPY}) add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${TEXTURE_FILE}" DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${TEXTURE_FILE}" @@ -118,6 +119,7 @@ foreach (TEXTURE_FILE ${TEXTURES_TO_COPY}) ) list(APPEND TEXTURE_TARGETS "${CMAKE_CURRENT_BINARY_DIR}/${TEXTURE_FILE}") endforeach() +endif() add_custom_target(textures ALL DEPENDS ${TEXTURE_TARGETS}) add_custom_target(textures_resource COMMAND mkdir -p ../resources/share/navit/textures COMMAND cp ${TEXTURE_TARGETS} ../resources/share/navit/textures) -- cgit v1.2.1