cmake,use built-in boost path variables instead

Author: melode11

CMakeLists.txt

@@ -58,27 +58,7 @@ return()
 endif()
 
 set(BOOST_VER "1.55.0" CACHE STRING "boost version" )
-set(BOOST_PATH "__boost__" CACHE STRING "boost root path" )
 
-if(${BOOST_PATH} STREQUAL "__boost__" )
-    set(BOOST_INCLUDE "__boost__" CACHE STRING "boost include path" )
-    set(BOOST_LIB "__boost__" CACHE STRING "boost lib path" )
-    MESSAGE(STATUS "BOOST_PATH not set, find BOOST_INCLUDE and BOOST_LIB" )
-
-    if(${BOOST_INCLUDE} STREQUAL "__boost__" OR ${BOOST_LIB} STREQUAL "__boost__" )
-        MESSAGE(SEND_ERROR "You need to specify either BOOST_PATH or BOOST_INCLUDE & BOOST_LIB" )
-        return()
-    else()
-        MESSAGE(STATUS "got include " ${BOOST_INCLUDE} )
-        MESSAGE(STATUS "got lib " ${BOOST_LIB} )
-        set(BOOST_INCLUDEDIR ${BOOST_INCLUDE} )
-        set(BOOST_LIBRARYDIR ${BOOST_LIB} )
-    endif()
-else()
-    MESSAGE(STATUS "got path " ${BOOST_PATH} )
-    set(BOOST_ROOT ${BOOST_PATH} )
-endif()
-set(Boost_DEBUG 1)
 set(Boost_USE_STATIC_LIBS ON) 
 set(Boost_USE_MULTITHREADED ON) 
 set(Boost_USE_STATIC_RUNTIME OFF) 

README.md

@@ -19,15 +19,15 @@ By virtue of being written in C++, this client works in several different platfo
 ###<a name="with_cmake"></a> With CMake
 1. Install boost, see [Boost setup](#boost_setup) section.
 2. Use `git clone --recurse-submodules https://github.com/socketio/socket.io-client-cpp.git` to clone your local repo.
-3. Run `cmake -DBOOST_PATH:STRING=<your boost install folder> -DBOOST_VER:STRING=<your boost version> ./`
+3. Run `cmake -DBOOST_ROOT:STRING=<your boost install folder> -DBOOST_VER:STRING=<your boost version> ./`
 4. Run `make install`(if makefile generated) or open generated project (if project file generated) to build.
 5. Outputs is under `./build`, link with the all static libs under `./build/lib` and  include headers under `./build/include` in your client code where you want to use it.
 
 * If you're using boost without install,you can specify `boost include dir` and `boost lib dir` separately by:
 ```bash
 cmake
--DBOOST_INCLUDE:STRING=<your boost include folder> 
--DBOOST_LIB:STRING=<your boost lib folder>
+-DBOOST_INCLUDEDIR=<your boost include folder> 
+-DBOOST_LIBRARYDIR=<your boost lib folder>
 -DBOOST_VER:STRING=<your boost version>
 ./
 ```

test/README.md

@@ -7,12 +7,12 @@ You need have your boost unpacked on your disk, at least staged following module
 
 Then use following instruction to gen makefile or VS project.
 ```bash
-cmake -DBOOST_LIB=`<your boost static libs path>` -DBOOST_INCLUDE=`<your boost include path>` -DBOOST_VER:STRING=`<your boost version>` -DCMAKE_BUILD_TYPE=Debug ./
+cmake -DBOOST_LIBRARYDIR=`<your boost static libs path>` -DBOOST_INCLUDEDIR=`<your boost include path>` -DBOOST_VER:STRING=`<your boost version>` -DCMAKE_BUILD_TYPE=Debug ./
 ```
 Then run `make` or open by VS.
 
 For example I've installed boost 1.57.0 at `D:\boost_1_57_0` and staged the static lib at `D\boost_1_57_0\build\lib` then the command should be:
 ```bash
-cmake -DBOOST_LIB=D:\boost_1_57_0\build\lib -DBOOST_INCLUDE=D:\boost_1_57_0 -DBOOST_VER:STRING=1.57.0 -DCMAKE_BUILD_TYPE=Debug ./
+cmake -DBOOST_LIBRARYDIR=D:\boost_1_57_0\build\lib -DBOOST_INCLUDEDIR=D:\boost_1_57_0 -DBOOST_VER:STRING=1.57.0 -DCMAKE_BUILD_TYPE=Debug ./
 ```
 In this case(Windows) CMake will create a VS project under `./test` folder. Open in VS and run it.