From 21cfdf04bd584bd89689e7507296472fc57321c1 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Mon, 8 Jan 2018 02:36:53 -0800 Subject: [PATCH] Revert "[cmake] Remove build_fish_pc target" This reverts commit 585321181d1f7573813ed8083a06118ab1d6a6a2. With the build_fish_pc target, a command like this fails: env DESTDIR=/tmp/fish-install ninja install --- cmake/Install.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 6166d626d..37b4c3ce7 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -115,6 +115,8 @@ ADD_CUSTOM_COMMAND(OUTPUT 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) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc DESTINATION ${rel_datadir}/pkgconfig) @@ -179,7 +181,7 @@ INSTALL(FILES ${MANUALS} DESTINATION ${mandir}/man1/ OPTIONAL) INSTALL(FILES share/lynx.lss DESTINATION ${rel_datadir}/fish/) # Group install targets into a InstallTargets folder -SET_PROPERTY(TARGET CHECK-FISH-BUILD-VERSION-FILE +SET_PROPERTY(TARGET build_fish_pc CHECK-FISH-BUILD-VERSION-FILE test_invocation test_fishscript test_prep tests_buildroot_target build_lexicon_filter