aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pulford <mark@kyne.com.au>2012-01-22 11:54:47 +1030
committerMark Pulford <mark@kyne.com.au>2012-03-04 18:54:36 +1030
commit910a28718325193a439bfc92225755776ff559d0 (patch)
tree7f8ef7eea1f4d3e88ab80f1b8ce397cde8de3bcd
parentcbea0e4258c2033dd1cf3c2003f800a83f75db40 (diff)
downloadlua-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.txt5
-rw-r--r--Makefile1
-rw-r--r--manual.txt2
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 @@
6project(lua-cjson C) 6project(lua-cjson C)
7cmake_minimum_required(VERSION 2.6) 7cmake_minimum_required(VERSION 2.6)
8 8
9option(ENABLE_CJSON_GLOBAL "Register a global cjson module table - not recommended")
10option(USE_INTERNAL_FPCONV "Use internal strtod() / g_fmt() code for performance") 9option(USE_INTERNAL_FPCONV "Use internal strtod() / g_fmt() code for performance")
11option(MULTIPLE_THREADS "Support multi-threaded apps with internal fpconv - recommended" ON) 10option(MULTIPLE_THREADS "Support multi-threaded apps with internal fpconv - recommended" ON)
12 11
@@ -19,10 +18,6 @@ endif()
19find_package(Lua51 REQUIRED) 18find_package(Lua51 REQUIRED)
20include_directories(${LUA_INCLUDE_DIR}) 19include_directories(${LUA_INCLUDE_DIR})
21 20
22if(ENABLE_CJSON_GLOBAL)
23 add_definitions(-DENABLE_CJSON_GLOBAL)
24endif()
25
26if(NOT USE_INTERNAL_FPCONV) 21if(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)
diff --git a/Makefile b/Makefile
index bf06d73..931a2a3 100644
--- a/Makefile
+++ b/Makefile
@@ -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.
diff --git a/manual.txt b/manual.txt
index f46117e..addde14 100644
--- a/manual.txt
+++ b/manual.txt
@@ -138,8 +138,6 @@ issues, and enable non-default features. Some build methods may
138automatically set platform specific options if required. Other features 138automatically set platform specific options if required. Other features
139should be enabled manually. 139should be enabled manually.
140 140
141ENABLE_CJSON_GLOBAL:: Register +cjson+ module table as a global variable
142 (not recommended).
143USE_INTERNAL_ISINF:: Workaround for Solaris platforms missing +isinf+. 141USE_INTERNAL_ISINF:: Workaround for Solaris platforms missing +isinf+.
144DISABLE_INVALID_NUMBERS:: Recommended on platforms where +strtod+ / 142DISABLE_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