diff options
author | Haibo Huang <hhb@google.com> | 2019-12-03 12:57:56 -0800 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2019-12-03 12:57:56 -0800 |
commit | 71aa0b1047729072861452eda91eaa957d95c9ce (patch) | |
tree | 013e7fd067b8eb8162b02258807e9926162d6f90 /support | |
parent | 414e7558668889839fb4fd9d5cbc5982171827f1 (diff) | |
parent | 4ca6821e8f26c96f815064f77dff0a74f562bffb (diff) | |
download | fmtlib-71aa0b1047729072861452eda91eaa957d95c9ce.tar.gz |
Upgrade fmtlib to 6.1.0
Test: None
Change-Id: I5db685146ca9241665ada5e15523666e48e67f3f
Diffstat (limited to 'support')
-rw-r--r-- | support/Vagrantfile | 2 | ||||
-rw-r--r-- | support/cmake/fmt.pc.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/support/Vagrantfile b/support/Vagrantfile index de0fcb9e..24f166a1 100644 --- a/support/Vagrantfile +++ b/support/Vagrantfile @@ -3,7 +3,7 @@ # A vagrant config for testing against gcc-4.8. Vagrant.configure("2") do |config| - config.vm.box = "ubuntu/trusty64" + config.vm.box = "ubuntu/xenial64" config.vm.provider "virtualbox" do |vb| vb.memory = "4096" diff --git a/support/cmake/fmt.pc.in b/support/cmake/fmt.pc.in index 79de0b6d..e935dc78 100644 --- a/support/cmake/fmt.pc.in +++ b/support/cmake/fmt.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ Name: fmt Description: A modern formatting library |