From 9e1576bdc4117d8f3fb027b834fb7c5d445a8722 Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Wed, 21 Feb 2018 13:50:05 -0600 Subject: [PATCH] Revert "[cmake] Add rule to generate FBVF" This reverts commit e4c59ac60a611d1238a940bdb8bdc28116ae715a. I hadn't seen the FBVF rule in the `Version` CMake file. There's something else going on here. --- cmake/Install.cmake | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 66be309fb..03e9b71c7 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -112,17 +112,12 @@ 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)