From 4ea0e4f606aa4173cc0fffd00e95a30ca3c219c8 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 28 Sep 2013 15:05:55 +0200 Subject: [PATCH] Add curl, freetype and luaJIT to CMAKE_BUILD_INFO --- src/CMakeLists.txt | 2 ++ src/cmake_config.h.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 937dfab8f..8a5212dca 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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") diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in index 7aea27ccb..c83df8e47 100644 --- a/src/cmake_config.h.in +++ b/src/cmake_config.h.in @@ -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 -- 2.25.1