Merge remote-tracking branch 'upstream/master' into update-docs

This commit is contained in:
Peter Feigl 2014-03-14 09:59:43 +01:00
commit be86d241cc
2 changed files with 1 additions and 3 deletions

View file

@ -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>

View file

@ -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