Add curl, freetype and luaJIT to CMAKE_BUILD_INFO 940/head
authorPilzAdam <pilzadam@minetest.net>
Sat, 28 Sep 2013 13:05:55 +0000 (15:05 +0200)
committerPilzAdam <pilzadam@minetest.net>
Sat, 28 Sep 2013 13:41:37 +0000 (15:41 +0200)
src/CMakeLists.txt
src/cmake_config.h.in

index 937dfab8fe3e09e26be974173ffe5f9d3ecd81af..8a5212dcabb54a134221727de15bf61df8dc251e 100644 (file)
@@ -187,8 +187,10 @@ find_path(LUA_INCLUDE_DIR luajit.h
 message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
 message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
 
+set(USE_LUAJIT 0)
 if(LUA_LIBRARY AND LUA_INCLUDE_DIR) 
        message (STATUS "LuaJIT found.")
+       set(USE_LUAJIT 1)
 else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
        message (STATUS "LuaJIT not found, using bundled Lua.")
        set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
index 7aea27ccbeeedfeceb20e62395798df8a6e6df02..c83df8e47ba53380531656f21fa72015df10c4da 100644 (file)
@@ -18,7 +18,7 @@
 #else
        #define CMAKE_BUILD_TYPE "Debug"
 #endif
-#define CMAKE_BUILD_INFO "VER=@VERSION_STRING@ BUILD_TYPE="CMAKE_BUILD_TYPE" RUN_IN_PLACE=@RUN_IN_PLACE@ USE_GETTEXT=@USE_GETTEXT@ USE_SOUND=@USE_SOUND@ STATIC_SHAREDIR=@SHAREDIR@"
+#define CMAKE_BUILD_INFO "VER=@VERSION_STRING@ BUILD_TYPE="CMAKE_BUILD_TYPE" RUN_IN_PLACE=@RUN_IN_PLACE@ USE_GETTEXT=@USE_GETTEXT@ USE_SOUND=@USE_SOUND@ USE_CURL=@USE_CURL@ USE_FREETYPE=@USE_FREETYPE@ USE_LUAJIT=@USE_LUAJIT@ STATIC_SHAREDIR=@SHAREDIR@"
 
 #endif