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:
parent
d314b459b8
commit
a07879739f
|
@ -3,9 +3,8 @@
|
||||||
package git
|
package git
|
||||||
|
|
||||||
/*
|
/*
|
||||||
#cgo CFLAGS: -I${SRCDIR}/vendor/libgit2/include
|
#cgo windows CFLAGS: -I${SRCDIR}/vendor/libgit2/include
|
||||||
#cgo LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2
|
#cgo windows LDFLAGS: -L${SRCDIR}/vendor/libgit2/build/ -lgit2 -lwinhttp
|
||||||
#cgo windows LDFLAGS: -lwinhttp
|
|
||||||
#cgo !windows pkg-config: --static ${SRCDIR}/vendor/libgit2/build/libgit2.pc
|
#cgo !windows pkg-config: --static ${SRCDIR}/vendor/libgit2/build/libgit2.pc
|
||||||
#include <git2.h>
|
#include <git2.h>
|
||||||
|
|
||||||
|
|
|
@ -16,4 +16,4 @@ cmake -DTHREADSAFE=ON \
|
||||||
-DCMAKE_INSTALL_PREFIX=../install \
|
-DCMAKE_INSTALL_PREFIX=../install \
|
||||||
.. &&
|
.. &&
|
||||||
|
|
||||||
cmake --build .
|
cmake --build . --target install
|
||||||
|
|
Loading…
Reference in New Issue