From 98098c8927015065d7e94685ce91bd9b2c9c272f Mon Sep 17 00:00:00 2001 From: Jason Morrison Date: Sun, 12 May 2013 17:05:09 -0700 Subject: [PATCH] Update installation for Ubuntu 12.04. Addresses build issue in #11. --- CMakeLists.txt | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7f8a3c..d2cb337 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ ELSE(APPLE) ADD_DEFINITIONS(-Wall -O3 -DNDEBUG -march=native -mtune=native `getconf LFS_CFLAGS`) ENDIF(APPLE) -INCLUDE_DIRECTORIES(include /usr/include/python2.6) +INCLUDE_DIRECTORIES(include /usr/include/python2.7) ADD_EXECUTABLE(test src/test/lexicon.cpp @@ -55,7 +55,7 @@ IF(APPLE) TARGET_LINK_LIBRARIES(pfpc pfp boost_filesystem-mt boost_thread-mt boost_regex-mt boost_system-mt icuio) TARGET_LINK_LIBRARIES(pfpc_token pfp boost_filesystem-mt boost_thread-mt boost_regex-mt boost_system-mt icuio) TARGET_LINK_LIBRARIES(test pfp boost_thread-mt boost_unit_test_framework-mt boost_regex-mt icuio) - TARGET_LINK_LIBRARIES(pfp boost_filesystem-mt boost_thread-mt boost_regex-mt boost_system-mt icuio icuuc) + TARGET_LINK_LIBRARIES(test pfp boost_filesystem boost_thread boost_unit_test_framework boost_regex boost_system icuio icuuc) ELSE(APPLE) TARGET_LINK_LIBRARIES(pfpd pfp boost_filesystem boost_thread boost_regex boost_system icuio icuuc) TARGET_LINK_LIBRARIES(pfpc pfp boost_filesystem boost_thread boost_regex boost_system icuio icuuc) diff --git a/README.md b/README.md index 3417708..a8e6f6a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ pfp is a **pretty fast statistical parser** for probabilistic context free gramm ## Installing -The following works on **Ubuntu 10.04 LTS**: +The following works on **Ubuntu 12.04 LTS**: sudo apt-get install -y git-core cmake build-essential libboost-all-dev python-dev git clone http://github.com/wavii/pfp.git && cd pfp