Merge pull request #4736 from abbradar/fix-msgpack

Fix version.h in libmsgpack
This commit is contained in:
Edward Tjörnhammar 2014-10-31 06:46:57 +01:00
commit 7ccfd6ed62

View File

@ -1,9 +1,11 @@
diff -r 791a4edd7e1d CMakeLists.txt diff -r 791a4edd7e1d CMakeLists.txt
--- a/CMakeLists.txt Sun Oct 05 13:14:14 2014 +0100 --- a/CMakeLists.txt Sun Oct 05 13:14:14 2014 +0100
+++ b/CMakeLists.txt Sun Oct 05 13:20:12 2014 +0100 +++ b/CMakeLists.txt Sun Oct 05 13:20:12 2014 +0100
@@ -158,7 +158,7 @@ @@ -157,8 +157,9 @@
INSTALL (TARGETS msgpack msgpack-static DESTINATION lib) INSTALL (TARGETS msgpack msgpack-static DESTINATION lib)
INSTALL (DIRECTORY src/msgpack DESTINATION include) INSTALL (DIRECTORY src/msgpack DESTINATION include)
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack/version.h DESTINATION include/msgpack)
INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include) INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include)
-INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig) -INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig)
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION lib/pkgconfig) +INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION lib/pkgconfig)