From 86b1542181a92841d174e1caec94d084a34e5158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <nerzhul@users.noreply.github.com>
Date: Sun, 2 Apr 2017 10:51:50 +0200
Subject: Update embedded jsoncpp from unk version to 0.10.6 + move libs to
 lib/ instead of src/ (#5473)

* Update embedded jsoncpp from unk version to 0.10.6

0.10.6 is last release without c++11

* Make jsoncpp more compliant with its amalgamate

Jsoncpp cpp file should be upper, make the library like it does in amalgamate

* Reorganization: move minetest embedded libs outside of source tree to /lib

* Fix a dead grep in LINT
---
 lib/lua/CMakeLists.txt | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 lib/lua/CMakeLists.txt

(limited to 'lib/lua/CMakeLists.txt')

diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt
new file mode 100644
index 000000000..119dd6302
--- /dev/null
+++ b/lib/lua/CMakeLists.txt
@@ -0,0 +1,77 @@
+cmake_minimum_required(VERSION 2.4 FATAL_ERROR)
+
+project(lua C)
+
+set(LUA_VERSION_MAJOR 5)
+set(LUA_VERSION_MINOR 1)
+set(LUA_VERSION_PATCH 4)
+set(LUA_VERSION "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+set(COMMON_CFLAGS)
+set(COMMON_LDFLAGS)
+set(LIBS)
+
+if(APPLE)
+	set(DEFAULT_POSIX TRUE)
+	set(DEFAULT_DLOPEN ON)
+	# use this on Mac OS X 10.3-
+	option(LUA_USE_MACOSX "Mac OS X 10.3-" OFF)
+elseif(UNIX OR CYGWIN)
+	set(DEFAULT_POSIX TRUE)
+elseif(WIN32)
+	set(LUA_WIN TRUE)
+	set(COMMON_CFLAGS "${COMMON_CFLAGS} -DLUA_BUILD_AS_DLL")
+else()
+	set(DEFAULT_ANSI TRUE)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+	set(COMMON_LDFLAGS "${COMMON_LDFLAGS} -Wl,-E -lm")
+	set(DEFAULT_DLOPEN ON)
+endif()
+
+# For "Mac OS X 10.3-"
+if(LUA_USE_MACOSX)
+	set(COMMON_CFLAGS "${COMMON_CFLAGS} -DLUA_USE_MACOSX")
+	set(LUA_USE_DLOPEN FALSE)
+endif(LUA_USE_MACOSX)
+
+option(LUA_USE_DLOPEN "Enable dlopen support." ${DEFAULT_DLOPEN})
+mark_as_advanced(LUA_USE_DLOPEN)
+
+option(LUA_ANSI "Disable non-ANSI features." ${DEFAULT_ANSI})
+mark_as_advanced(LUA_ANSI)
+
+if(LUA_USE_DLOPEN)
+	set(COMMON_CFLAGS "${COMMON_CFLAGS} -DLUA_USE_DLOPEN")
+	if(NOT APPLE)
+		set(COMMON_LDFLAGS "${COMMON_LDFLAGS} -ldl ")
+	endif(NOT APPLE)
+endif(LUA_USE_DLOPEN)
+
+if(DEFAULT_POSIX)
+	set(COMMON_CFLAGS "${COMMON_CFLAGS} -DLUA_USE_POSIX")
+endif(DEFAULT_POSIX)
+
+if(LUA_ANSI)
+	set(COMMON_CFLAGS "${COMMON_CFLAGS} -DLUA_ANSI")
+endif(LUA_ANSI)
+
+# COMMON_CFLAGS has no effect without this line
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_CFLAGS}")
+
+
+# Standard flags to use for each build type.
+if(CMAKE_COMPILER_IS_GNUCC)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Wall -Wextra -Wshadow -W -pedantic -std=gnu99")
+	set(CMAKE_C_FLAGS_RELEASE        "${CMAKE_C_FLAGS_RELEASE}     -O2")
+	set(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG}       -O0 -g")
+	set(CMAKE_C_FLAGS_PROFILE        "${CMAKE_C_FLAGS_PROFILE}     -O1 -g")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_WITHDEBINFO} -O2 -g")
+endif(CMAKE_COMPILER_IS_GNUCC)
+
+
+add_subdirectory(src build)
+
-- 
cgit v1.2.3