diff options
| author | Mark Pulford <mark@kyne.com.au> | 2012-01-22 11:54:47 +1030 |
|---|---|---|
| committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 18:54:36 +1030 |
| commit | 910a28718325193a439bfc92225755776ff559d0 (patch) | |
| tree | 7f8ef7eea1f4d3e88ab80f1b8ce397cde8de3bcd | |
| parent | cbea0e4258c2033dd1cf3c2003f800a83f75db40 (diff) | |
| download | lua-cjson-910a28718325193a439bfc92225755776ff559d0.tar.gz lua-cjson-910a28718325193a439bfc92225755776ff559d0.tar.bz2 lua-cjson-910a28718325193a439bfc92225755776ff559d0.zip | |
Remove ENABLE_CJSON_GLOBAL option
Remove ENABLE_CJSON_GLOBAL option since it is not recommended or
necessary and doesn't need to be discussed in the manual.
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | manual.txt | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb598fe..c17239b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | project(lua-cjson C) | 6 | project(lua-cjson C) |
| 7 | cmake_minimum_required(VERSION 2.6) | 7 | cmake_minimum_required(VERSION 2.6) |
| 8 | 8 | ||
| 9 | option(ENABLE_CJSON_GLOBAL "Register a global cjson module table - not recommended") | ||
| 10 | option(USE_INTERNAL_FPCONV "Use internal strtod() / g_fmt() code for performance") | 9 | option(USE_INTERNAL_FPCONV "Use internal strtod() / g_fmt() code for performance") |
| 11 | option(MULTIPLE_THREADS "Support multi-threaded apps with internal fpconv - recommended" ON) | 10 | option(MULTIPLE_THREADS "Support multi-threaded apps with internal fpconv - recommended" ON) |
| 12 | 11 | ||
| @@ -19,10 +18,6 @@ endif() | |||
| 19 | find_package(Lua51 REQUIRED) | 18 | find_package(Lua51 REQUIRED) |
| 20 | include_directories(${LUA_INCLUDE_DIR}) | 19 | include_directories(${LUA_INCLUDE_DIR}) |
| 21 | 20 | ||
| 22 | if(ENABLE_CJSON_GLOBAL) | ||
| 23 | add_definitions(-DENABLE_CJSON_GLOBAL) | ||
| 24 | endif() | ||
| 25 | |||
| 26 | if(NOT USE_INTERNAL_FPCONV) | 21 | if(NOT USE_INTERNAL_FPCONV) |
| 27 | # Use libc number conversion routines (strtod(), sprintf()) | 22 | # Use libc number conversion routines (strtod(), sprintf()) |
| 28 | set(FPCONV_SOURCES fpconv.c) | 23 | set(FPCONV_SOURCES fpconv.c) |
| @@ -1,6 +1,5 @@ | |||
| 1 | ##### Available defines for CJSON_CFLAGS ##### | 1 | ##### Available defines for CJSON_CFLAGS ##### |
| 2 | ## | 2 | ## |
| 3 | ## ENABLE_CJSON_GLOBAL: Register "cjson" module table as a global variable. | ||
| 4 | ## USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf(). | 3 | ## USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf(). |
| 5 | ## DISABLE_INVALID_NUMBERS: Permanently disable invalid JSON numbers: | 4 | ## DISABLE_INVALID_NUMBERS: Permanently disable invalid JSON numbers: |
| 6 | ## NaN, Infinity, hex. | 5 | ## NaN, Infinity, hex. |
| @@ -138,8 +138,6 @@ issues, and enable non-default features. Some build methods may | |||
| 138 | automatically set platform specific options if required. Other features | 138 | automatically set platform specific options if required. Other features |
| 139 | should be enabled manually. | 139 | should be enabled manually. |
| 140 | 140 | ||
| 141 | ENABLE_CJSON_GLOBAL:: Register +cjson+ module table as a global variable | ||
| 142 | (not recommended). | ||
| 143 | USE_INTERNAL_ISINF:: Workaround for Solaris platforms missing +isinf+. | 141 | USE_INTERNAL_ISINF:: Workaround for Solaris platforms missing +isinf+. |
| 144 | DISABLE_INVALID_NUMBERS:: Recommended on platforms where +strtod+ / | 142 | DISABLE_INVALID_NUMBERS:: Recommended on platforms where +strtod+ / |
| 145 | +sprintf+ are not POSIX compliant (eg, Windows MinGW). Prevents | 143 | +sprintf+ are not POSIX compliant (eg, Windows MinGW). Prevents |
