Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[cmake] Remove build_fish_pc target"

Browse source 
This reverts commit 585321181d.

With the build_fish_pc target, a command like this fails:
  env DESTDIR=/tmp/fish-install ninja install
This commit is contained in:
ridiculousfish 2018-01-08 02:36:53 -08:00
parent da8db7f6f0
commit 21cfdf04bd
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/Install.cmake
View file

@ -115,6 +115,8 @@ ADD_CUSTOM_COMMAND(OUTPUT fish.pc
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${FBVF} ${CMAKE_CURRENT_BINARY_DIR}/fish.pc.noversion) 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 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc
DESTINATION ${rel_datadir}/pkgconfig) DESTINATION ${rel_datadir}/pkgconfig)
@ -179,7 +181,7 @@ INSTALL(FILES ${MANUALS} DESTINATION ${mandir}/man1/ OPTIONAL)
INSTALL(FILES share/lynx.lss DESTINATION ${rel_datadir}/fish/) INSTALL(FILES share/lynx.lss DESTINATION ${rel_datadir}/fish/)
# Group install targets into a InstallTargets folder # 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_invocation test_fishscript
test_prep tests_buildroot_target test_prep tests_buildroot_target
build_lexicon_filter build_lexicon_filter