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

Factor fish sources into library in CMake build

Browse source 
This adds a new library fishlib, which the CMake build builds.
This library is linked by the tests, fish, and fish_indent, so
that object files do not have to be built separately for each
of them.
This commit is contained in:
ridiculousfish 2017-10-04 21:33:43 -07:00
parent 4113e406a9
commit a7f22f7df3
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CMakeLists.txt
View file

@ -69,22 +69,30 @@ INCLUDE(CMakeFiles/Docs.cmake)
# Define a function to link dependencies. # Define a function to link dependencies.
FUNCTION(FISH_LINK_DEPS target) FUNCTION(FISH_LINK_DEPS target)
TARGET_LINK_LIBRARIES(${target} ${CURSES_LIBRARIES} Threads::Threads) TARGET_LINK_LIBRARIES(${target} fishlib)
TARGET_LINK_LIBRARIES(${target} ${PCRE2_LIB} muparser)
ENDFUNCTION(FISH_LINK_DEPS) ENDFUNCTION(FISH_LINK_DEPS)
# Define libfish.a.
ADD_LIBRARY(fishlib STATIC ${FISH_SRCS})
TARGET_LINK_LIBRARIES(fishlib
${CURSES_LIBRARIES} Threads::Threads
${PCRE2_LIB} muparser)
# builtin_math.cpp needs to see muParser's built header.
ADD_DEPENDENCIES(fishlib muparser)
# Define fish. # Define fish.
ADD_EXECUTABLE(fish src/fish.cpp ${FISH_SRCS}) ADD_EXECUTABLE(fish src/fish.cpp)
FISH_LINK_DEPS(fish) FISH_LINK_DEPS(fish)
# Define fish_indent. # Define fish_indent.
ADD_EXECUTABLE(fish_indent ADD_EXECUTABLE(fish_indent
src/fish_indent.cpp src/print_help.cpp ${FISH_SRCS}) src/fish_indent.cpp src/print_help.cpp)
FISH_LINK_DEPS(fish_indent) FISH_LINK_DEPS(fish_indent)
# Define fish_key_reader. # Define fish_key_reader.
ADD_EXECUTABLE(fish_key_reader ADD_EXECUTABLE(fish_key_reader
src/fish_key_reader.cpp src/print_help.cpp ${FISH_SRCS}) src/fish_key_reader.cpp src/print_help.cpp)
FISH_LINK_DEPS(fish_key_reader) FISH_LINK_DEPS(fish_key_reader)
# Set up tests. # Set up tests.