Merge pull request #20 from alanxz/cmake_build_improvements

CMake build system improvements

1 files changed, 6 insertions, 13 deletions

diff --git a/README.md b/README.md
index 92fd1a5..caed1e6 100644
--- a/README.md
+++ b/README.md
@@ -49,14 +49,14 @@ to build the `librabbitmq` library and the example programs.
 
 ### Using cmake
 
-You will need CMake: http://cmake.org/
+You will need CMake (v2.6 or better): http://cmake.org/
 
-You will need a working python install in your path.
+You will need a working python install (2.6+) with the json or simplejson
+modules installed.
 
-If you would like the build system to fetch the rabbitmq-codegen
-automatically you will need to have a working git install in your
-path. Otherwise you will need to checkout the rabbitmq-codegen as
-stated above.
+You will need to do the git submodule init/update as above.
+Alternatively you can clone the rabbitmq-codegen repository and point
+cmake to it using the RABBITMQ_CODEGEN_DIR cmake variable
 
 Create a binary directory in a sibling directory from the directory
 you cloned the rabbitmq-c repository
@@ -78,13 +78,6 @@ Things you can pass to cmake to change the build:
 * `-DRABBITMQ_CODEGEN_DIR=/path/to/rabbitmq-codegen/checkout` - if you
    have your codegen directory in a different place [Default is
    sibiling directory to source]
-* `-DFETCH_CODEGEN_FROM_GIT=ON` - if you want cmake to fetch the
-   rabbitmq-codegen from https://github.com/rabbitmq/rabbitmq-codegen
-   at build time. If this option is selected `-DRABBITMQ_CODEGEN_DIR`
-   will be ignored [Default is off]
-* `-DCODEGEN_GIT_TAG=rabbitmq_v2_5_1` - specifies the tag to check out
-   if using the `-DFETCH_CODEGEN_FROM_GIT` option above. [Default is
-   `rabbitmq_v2_5_1`]
 * `-DBUILD_TOOLS=OFF` build the programs in the tools directory
     [Default is ON if the POPT library can be found]