From 1b27c97bfbbbf4744ee39e8c55da5f0462c78c5d Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Wed, 21 Feb 2018 13:40:15 -0600 Subject: [PATCH] [cmake] Fix dependency path for FBVF for fish.pc rule The custom command for fish.pc had a dependency on FBVF, but it appears that the relative path to FBVF was incorrect and with CMake 3.10.1 under FreeBSD this was consistently causing the build to fail if ../build_tools/git_version_gen.sh hadn't (coincidentally, I think?) already run. Explicitly set the dependency path for FBVF to the binary directory. --- cmake/Install.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 03e9b71c7..389c95084 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -112,12 +112,13 @@ FISH_CREATE_DIRS(${rel_datadir}/pkgconfig ${extra_completionsdir} # @echo "Installing pkgconfig file" # $v $(INSTALL) -m 644 fish.pc $(DESTDIR)$(datadir)/pkgconfig CONFIGURE_FILE(fish.pc.in fish.pc.noversion) + ADD_CUSTOM_COMMAND(OUTPUT fish.pc - COMMAND sed '/Version/d' fish.pc.noversion > fish.pc - COMMAND echo -n "Version: " >> fish.pc - COMMAND sed 's/FISH_BUILD_VERSION=//\;s/\"//g' ${FBVF} >> fish.pc - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${FBVF} ${CMAKE_CURRENT_BINARY_DIR}/fish.pc.noversion) + COMMAND sed '/Version/d' fish.pc.noversion > fish.pc + COMMAND echo -n "Version: " >> fish.pc + COMMAND sed 's/FISH_BUILD_VERSION=//\;s/\"//g' ${FBVF} >> fish.pc + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FBVF} ${CMAKE_CURRENT_BINARY_DIR}/fish.pc.noversion) ADD_CUSTOM_TARGET(build_fish_pc ALL DEPENDS fish.pc)