diff options
| author | Peter Feigl <craven@gmx.net> | 2014-03-14 09:59:43 +0100 |
|---|---|---|
| committer | Peter Feigl <craven@gmx.net> | 2014-03-14 09:59:43 +0100 |
| commit | be86d241cc8f1a434aa1542f9070fd61c621092a (patch) | |
| tree | e52a7a0e1632d22fc298de990df96052393878fc | |
| parent | fca30d93f13c5b67a95f0286eebcbe1d698f2793 (diff) | |
| parent | 69c7a44b3e245a97ea04bad469a3922debae0805 (diff) | |
| download | ledger-be86d241cc8f1a434aa1542f9070fd61c621092a.tar.gz ledger-be86d241cc8f1a434aa1542f9070fd61c621092a.tar.bz2 ledger-be86d241cc8f1a434aa1542f9070fd61c621092a.zip | |
Merge remote-tracking branch 'upstream/master' into update-docs
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 |
2 files changed, 1 insertions, 3 deletions
@@ -65,6 +65,7 @@ current `master` branch: <tr><td>Boost</td><td>1.35</td><td></td></tr> <tr><td>GMP</td><td>4.2.2</td><td></td></tr> <tr><td>MPFR</td><td>2.4.0</td><td></td></tr> +<tr><td>utfcpp</td><td>2.3.4</td><td></td></tr> <tr><td>gettext</td><td>0.17</td><td><em>optional</em></td></tr> <tr><td>libedit</td><td>20090111-3.0</td><td><em>optional</em></td></tr> <tr><td>Python</td><td>2.4</td><td><em>optional</em></td></tr> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8359308e..6304a50c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -268,9 +268,6 @@ if(BUILD_LIBRARY) install(TARGETS libledger DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${LEDGER_INCLUDES} ${PROJECT_SOURCE_DIR}/lib/sha1.h - ${PROJECT_SOURCE_DIR}/lib/utfcpp/source/utf8.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ledger) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/lib/utfcpp/source/utf8 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ledger) else() add_executable(ledger |