Android fix + better cmake style

CMakeLists.txt

@@ -191,6 +191,7 @@ endif()
 # Subdirectories
 # Be sure to add all relevant definitions above this
 
+add_subdirectory(lib)
 add_subdirectory(src)
 
 

build/android/jni/Android.mk

@@ -98,8 +98,8 @@ endif
 LOCAL_C_INCLUDES := \
  jni/src \
  jni/src/script \
- jni/src/lua/src \
- jni/src/jsoncpp \
+ jni/lib/lua/src \
+ jni/lib/jsoncpp \
  jni/src/cguittfont \
  deps/irrlicht/include \
  deps/libiconv/include \
@@ -334,36 +334,36 @@ LOCAL_SRC_FILES += jni/src/cguittfont/xCGUITTFont.cpp
 
 # Lua
 LOCAL_SRC_FILES += \
- jni/src/lua/src/lapi.c \
- jni/src/lua/src/lauxlib.c \
- jni/src/lua/src/lbaselib.c \
- jni/src/lua/src/lcode.c \
- jni/src/lua/src/ldblib.c \
- jni/src/lua/src/ldebug.c \
- jni/src/lua/src/ldo.c \
- jni/src/lua/src/ldump.c \
- jni/src/lua/src/lfunc.c \
- jni/src/lua/src/lgc.c \
- jni/src/lua/src/linit.c \
- jni/src/lua/src/liolib.c \
- jni/src/lua/src/llex.c \
- jni/src/lua/src/lmathlib.c \
- jni/src/lua/src/lmem.c \
- jni/src/lua/src/loadlib.c \
- jni/src/lua/src/lobject.c \
- jni/src/lua/src/lopcodes.c \
- jni/src/lua/src/loslib.c \
- jni/src/lua/src/lparser.c \
- jni/src/lua/src/lstate.c \
- jni/src/lua/src/lstring.c \
- jni/src/lua/src/lstrlib.c \
- jni/src/lua/src/ltable.c \
- jni/src/lua/src/ltablib.c \
- jni/src/lua/src/ltm.c \
- jni/src/lua/src/lundump.c \
- jni/src/lua/src/lvm.c \
- jni/src/lua/src/lzio.c \
- jni/src/lua/src/print.c
+ jni/lib/lua/src/lapi.c \
+ jni/lib/lua/src/lauxlib.c \
+ jni/lib/lua/src/lbaselib.c \
+ jni/lib/lua/src/lcode.c \
+ jni/lib/lua/src/ldblib.c \
+ jni/lib/lua/src/ldebug.c \
+ jni/lib/lua/src/ldo.c \
+ jni/lib/lua/src/ldump.c \
+ jni/lib/lua/src/lfunc.c \
+ jni/lib/lua/src/lgc.c \
+ jni/lib/lua/src/linit.c \
+ jni/lib/lua/src/liolib.c \
+ jni/lib/lua/src/llex.c \
+ jni/lib/lua/src/lmathlib.c \
+ jni/lib/lua/src/lmem.c \
+ jni/lib/lua/src/loadlib.c \
+ jni/lib/lua/src/lobject.c \
+ jni/lib/lua/src/lopcodes.c \
+ jni/lib/lua/src/loslib.c \
+ jni/lib/lua/src/lparser.c \
+ jni/lib/lua/src/lstate.c \
+ jni/lib/lua/src/lstring.c \
+ jni/lib/lua/src/lstrlib.c \
+ jni/lib/lua/src/ltable.c \
+ jni/lib/lua/src/ltablib.c \
+ jni/lib/lua/src/ltm.c \
+ jni/lib/lua/src/lundump.c \
+ jni/lib/lua/src/lvm.c \
+ jni/lib/lua/src/lzio.c \
+ jni/lib/lua/src/print.c
 
 # SQLite3
 LOCAL_SRC_FILES += deps/sqlite/sqlite3.c
@@ -376,7 +376,7 @@ LOCAL_SRC_FILES += \
  jni/src/threading/thread.cpp
 
 # JSONCPP
-LOCAL_SRC_FILES += jni/src/jsoncpp/json/jsoncpp.cpp
+LOCAL_SRC_FILES += jni/lib/jsoncpp/jsoncpp.cpp
 
 LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp
 LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS)

cmake/Modules/FindGMP.cmake

@@ -1,7 +1,6 @@
-
 option(ENABLE_SYSTEM_GMP "Use GMP from system" TRUE)
 mark_as_advanced(GMP_LIBRARY GMP_INCLUDE_DIR)
-set(USE_SYSTEM_GMP FALSE)
+set(USE_SYSTEM_GMP FALSE PARENT_SCOPE)
 
 if(ENABLE_SYSTEM_GMP)
  find_library(GMP_LIBRARY NAMES libgmp.so)
@@ -10,6 +9,7 @@ if(ENABLE_SYSTEM_GMP)
  if(GMP_LIBRARY AND GMP_INCLUDE_DIR)
  message (STATUS "Using GMP provided by system.")
  set(USE_SYSTEM_GMP TRUE)
+ set(USE_SYSTEM_GMP TRUE PARENT_SCOPE)
  else()
  message (STATUS "Detecting GMP from system failed.")
  endif()
@@ -19,9 +19,9 @@ endif()
 
 if(NOT USE_SYSTEM_GMP)
  message(STATUS "Using bundled mini-gmp library.")
- set(GMP_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/../lib/gmp)
- set(GMP_LIBRARY gmp)
- add_subdirectory(${PROJECT_SOURCE_DIR}/../lib/gmp ${PROJECT_BINARY_DIR}/../lib/gmp)
+ set(GMP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gmp PARENT_SCOPE)
+ set(GMP_LIBRARY gmp PARENT_SCOPE)
+ add_subdirectory(gmp)
 endif()
 
 include(FindPackageHandleStandardArgs)

cmake/Modules/FindJson.cmake

@@ -20,8 +20,7 @@ endif()
 
 if(NOT JSONCPP_FOUND)
  message(STATUS "Using bundled JSONCPP library.")
- set(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/../lib/jsoncpp)
- set(JSON_LIBRARY jsoncpp)
- add_subdirectory(${PROJECT_SOURCE_DIR}/../lib/jsoncpp ${CMAKE_BINARY_DIR}/lib/jsoncpp)
+ set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp PARENT_SCOPE)
+ set(JSON_LIBRARY jsoncpp PARENT_SCOPE)
+ add_subdirectory(jsoncpp)
 endif()
-

lib/CMakeLists.txt

@@ -0,0 +1,23 @@
+# LuaJIT
+option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE)
+set(USE_LUAJIT FALSE PARENT_SCOPE)
+if(ENABLE_LUAJIT)
+ find_package(LuaJIT)
+ if(LUAJIT_FOUND)
+ set(USE_LUAJIT TRUE)
+ set(USE_LUAJIT TRUE PARENT_SCOPE)
+ message (STATUS "Using LuaJIT provided by system.")
+ endif(LUAJIT_FOUND)
+else()
+ message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)")
+endif()
+
+if(NOT USE_LUAJIT)
+ message(STATUS "LuaJIT not found, using bundled Lua.")
+ set(LUA_LIBRARY "lua")
+ set(LUA_INCLUDE_DIR "lua/src")
+ add_subdirectory(lua)
+endif()
+
+find_package(GMP REQUIRED)
+find_package(Json REQUIRED)

src/CMakeLists.txt

@@ -156,26 +156,6 @@ if(ENABLE_FREETYPE)
  endif()
 endif(ENABLE_FREETYPE)
 
-# LuaJIT
-option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE)
-set(USE_LUAJIT FALSE)
-if(ENABLE_LUAJIT)
- find_package(LuaJIT)
- if(LUAJIT_FOUND)
- set(USE_LUAJIT TRUE)
- endif(LUAJIT_FOUND)
-else()
- message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)")
-endif()
-if(NOT USE_LUAJIT)
- message(STATUS "LuaJIT not found, using bundled Lua.")
- set(LUA_LIBRARY "lua")
- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../lib/lua/src")
- add_subdirectory(../lib/lua ${CMAKE_BINARY_DIR}/lib/lua)
-endif()
-
-find_package(GMP REQUIRED)
-
 option(ENABLE_CURSES "Enable ncurses console" TRUE)
 set(USE_CURSES FALSE)
 
@@ -253,7 +233,6 @@ endif(ENABLE_REDIS)
 
 
 find_package(SQLite3 REQUIRED)
-find_package(Json REQUIRED)
 
 OPTION(ENABLE_SPATIAL "Enable SpatialIndex AreaStore backend" TRUE)
 set(USE_SPATIAL FALSE)