From 2ea7c4ae2e9c93d698f4d9065ebd5a49904720c6 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Fri, 24 Mar 2023 14:49:40 +0100 Subject: Use symlink in the build directory for includes Make includes work though a symlink rather than modifying the generated sources. This is necessary so that headers included from the main header work. --- bindings/vala/examples/CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/bindings/vala/examples/CMakeLists.txt b/bindings/vala/examples/CMakeLists.txt index 2751096..cb869d3 100644 --- a/bindings/vala/examples/CMakeLists.txt +++ b/bindings/vala/examples/CMakeLists.txt @@ -4,6 +4,7 @@ add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-example.c" DEPENDS "bindings-vala" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_BINARY_DIR}/src" "${CMAKE_CURRENT_BINARY_DIR}/libayatana-appindicator" COMMAND ${VALA_COMPILER} --pkg ayatana-appindicator3-0.1 @@ -12,16 +13,11 @@ add_custom_command( -C ayatana-indicator-example.vala --metadatadir "${CMAKE_SOURCE_DIR}/src" --directory=${CMAKE_CURRENT_BINARY_DIR} - VERBATIM - COMMAND - sed - -i "s|#include\\s*<\\s*libayatana-appindicator/app-indicator.h\\s*>||g" - "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-example.c" ) # ayatana-indicator-example -set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-example.c" PROPERTIES COMPILE_FLAGS " -include ${CMAKE_SOURCE_DIR}/src/app-indicator.h -Wno-incompatible-pointer-types") +set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-example.c" PROPERTIES COMPILE_FLAGS " -Wno-incompatible-pointer-types") add_executable("ayatana-indicator-example" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-example.c") -target_include_directories("ayatana-indicator-example" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) +target_include_directories("ayatana-indicator-example" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries("ayatana-indicator-example" "${PROJECT_DEPS_LIBRARIES} -layatana-appindicator3 -L${CMAKE_BINARY_DIR}/src") -- cgit v1.2.3