From e4c59ac60a611d1238a940bdb8bdc28116ae715a Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 21 Feb 2018 13:40:15 -0600
Subject: [PATCH] [cmake] Add rule to generate FBVF

The custom command for fish.pc had a dependency on FBVF, but there was
no cmake rule for the generation of the FBVF file. 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.
---
 cmake/Install.cmake | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index 03e9b71c7..66be309fb 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -112,12 +112,17 @@ 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 ${FBVF}
+    COMMAND ./build_tools/git_version_gen.sh
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
 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 ${FBVF} ${CMAKE_CURRENT_BINARY_DIR}/fish.pc.noversion)
 
 ADD_CUSTOM_TARGET(build_fish_pc ALL DEPENDS fish.pc)