diff options
| author | PilzAdam <pilzadam@minetest.net> | 2013-09-28 15:05:55 +0200 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-09-28 15:41:37 +0200 |
| commit | 4ea0e4f606aa4173cc0fffd00e95a30ca3c219c8 (patch) | |
| tree | d22ed5dc11045e1fd6448cf05ca277464f571a30 /src | |
| parent | fb6a789991ba633a330bacaf0e915019a01b602f (diff) | |
| download | minetest-4ea0e4f606aa4173cc0fffd00e95a30ca3c219c8.tar.gz minetest-4ea0e4f606aa4173cc0fffd00e95a30ca3c219c8.tar.bz2 minetest-4ea0e4f606aa4173cc0fffd00e95a30ca3c219c8.zip | |
Add curl, freetype and luaJIT to CMAKE_BUILD_INFO
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/cmake_config.h.in | 2 |
2 files changed, 3 insertions, 1 deletions
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 |