build: chase changes for cmake & meson i hope

feature/tap-sh
William Pitcock 2018-02-12 00:45:55 -06:00
parent 2902141a9f
commit 1e91c245e3
2 changed files with 5 additions and 4 deletions

View File

@ -98,7 +98,8 @@ ADD_SUBDIRECTORY(libpkgconf)
#-------- Build and install executable --------
INCLUDE_DIRECTORIES(${libpkgconf_BINARY_DIR})
ADD_EXECUTABLE(pkgconf main.c getopt_long.c renderer-msvc.c)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Icli")
ADD_EXECUTABLE(pkgconf cli/main.c cli/getopt_long.c cli/renderer-msvc.c)
TARGET_LINK_LIBRARIES(pkgconf libpkgconf)
INSTALL(TARGETS pkgconf DESTINATION bin)

View File

@ -77,9 +77,9 @@ libpkgconf = shared_library('pkgconf',
pkgconf_exe = executable('pkgconf',
'main.c',
'getopt_long.c',
'renderer-msvc.c',
'cli/main.c',
'cli/getopt_long.c',
'cli/renderer-msvc.c',
link_with : libpkgconf,
install : true)