diff --git a/ChangeLog.md b/ChangeLog.md index 2d9ce3f..4263582 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,6 @@ ## v2.3.5 is coming -1. 适配低级版本的`g++`,已在`g++ 4.4.7`上测试通过。 +1. 适配更低级版本的`g++`和`cmake`,已在`g++ 4.1.2`和`cmake 2.6`上测试通过。 2. 修改一些测试用例的文件,减少测试时编译的时间。 ## v2.3.4 diff --git a/README.md b/README.md index f99b4e4..7fe6dfc 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ ### 依赖 -* g++ (version >= 4.4.7 recommended); -* cmake (version >= 2.8 recommended); +* g++ (version >= 4.1 recommended); +* cmake (version >= 2.6 recommended); ### 下载和安装 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 98ee947..5a8aaed 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) ADD_EXECUTABLE(segment.demo segment.cpp) ADD_EXECUTABLE(keyword.demo keyword_demo.cpp) diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt index 79457cd..ebf0322 100644 --- a/test/unittest/CMakeLists.txt +++ b/test/unittest/CMakeLists.txt @@ -1,5 +1,5 @@ -SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test) -SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test/lib) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) +SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) SET(GTEST_ROOT_DIR gtest-1.6.0)