diff options
author | Mark Pulford <mark@kyne.com.au> | 2012-01-22 05:24:47 +0400 |
---|---|---|
committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 12:24:36 +0400 |
commit | 910a28718325193a439bfc92225755776ff559d0 (patch) | |
tree | 7f8ef7eea1f4d3e88ab80f1b8ce397cde8de3bcd | |
parent | cbea0e4258c2033dd1cf3c2003f800a83f75db40 (diff) |
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 @@ project(lua-cjson C) cmake_minimum_required(VERSION 2.6) -option(ENABLE_CJSON_GLOBAL "Register a global cjson module table - not recommended") option(USE_INTERNAL_FPCONV "Use internal strtod() / g_fmt() code for performance") option(MULTIPLE_THREADS "Support multi-threaded apps with internal fpconv - recommended" ON) @@ -19,10 +18,6 @@ endif() find_package(Lua51 REQUIRED) include_directories(${LUA_INCLUDE_DIR}) -if(ENABLE_CJSON_GLOBAL) - add_definitions(-DENABLE_CJSON_GLOBAL) -endif() - if(NOT USE_INTERNAL_FPCONV) # Use libc number conversion routines (strtod(), sprintf()) set(FPCONV_SOURCES fpconv.c) @@ -1,6 +1,5 @@ ##### Available defines for CJSON_CFLAGS ##### ## -## ENABLE_CJSON_GLOBAL: Register "cjson" module table as a global variable. ## USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf(). ## DISABLE_INVALID_NUMBERS: Permanently disable invalid JSON numbers: ## NaN, Infinity, hex. @@ -138,8 +138,6 @@ issues, and enable non-default features. Some build methods may automatically set platform specific options if required. Other features should be enabled manually. -ENABLE_CJSON_GLOBAL:: Register +cjson+ module table as a global variable - (not recommended). USE_INTERNAL_ISINF:: Workaround for Solaris platforms missing +isinf+. DISABLE_INVALID_NUMBERS:: Recommended on platforms where +strtod+ / +sprintf+ are not POSIX compliant (eg, Windows MinGW). Prevents |