Support custom specify RapidJSON include path on cmake or luarocks co…

…mmand line.
xpol · Jan 29, 2016 · 9b46c91 · 9b46c91
1 parent 0a6c198
commit 9b46c91
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,7 +35,11 @@ if (NOT LUA_INCLUDE_DIR)
     find_package(Lua REQUIRED)
 endif()
 
-include_directories(${LUA_INCLUDE_DIR} rapidjson/include)
+if (NOT RAPIDJSON_INCLUDE_DIRS)
+  set(RAPIDJSON_INCLUDE_DIRS=rapidjson/include)
+endif()
+
+include_directories(${LUA_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIRS})
 
 add_library (rapidjson MODULE src/rapidjson.cpp)
 

diff --git a/README.md b/README.md
@@ -17,6 +17,10 @@ bug report and feature request.
 
     luarocks install rapidjson
 
+or if you like to use your own version of RapidJSON, use:
+
+    luarocks install rapidjson RAPIDJSON_INCLUDE_DIRS=path/to/rapidjson/include/dir
+
 ```Lua
 local rapidjson = require('rapidjson')
 
@@ -310,6 +314,10 @@ The current loaded rapidjson version. `"scm"` when not build with luarocks.
 
 ## Changelog
 
+### 0.4.3
+
+* CMakeLists.txt supports command line defined `RAPIDJSON_INCLUDE_DIRS` to specified RapidJSON include directory.
+
 ### 0.4.2
 
 * Update RapidJSON to latest HEAD version.

diff --git a/rapidjson-0.4.2-1.rockspec → rapidjson-0.4.3-1.rockspec b/rapidjson-0.4.2-1.rockspec → rapidjson-0.4.3-1.rockspec
@@ -1,5 +1,5 @@
 package = "rapidjson"
-version = "0.4.2-1"
+version = "0.4.3-1"
 local v = version:gsub("%-%d", "")
 source = {
    url = "git://github.com/xpol/lua-rapidjson",