Merge pull request #445 from rmg/exclusive-pkg-config

static: use pkg-config exclusively when using it
(cherry picked from commit bcf325244c)
This commit is contained in:
Carlos Martín Nieto 2019-01-04 12:18:20 +00:00 committed by lhchavez
parent d314b459b8
commit a07879739f
2 changed files with 3 additions and 4 deletions

View File

@ -3,9 +3,8 @@
package git
/*
#cgo CFLAGS: -I${SRCDIR}/vendor/libgit2/include
#cgo LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2
#cgo windows LDFLAGS: -lwinhttp
#cgo windows CFLAGS: -I${SRCDIR}/vendor/libgit2/include
#cgo windows LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2 -lwinhttp
#cgo !windows pkg-config: --static ${SRCDIR}/vendor/libgit2/build/libgit2.pc
#include <git2.h>

View File

@ -16,4 +16,4 @@ cmake -DTHREADSAFE=ON \
-DCMAKE_INSTALL_PREFIX=../install \
.. &&
cmake --build .
cmake --build . --target install