Skip to content

Commit 93fcab9

Browse files
ShadowNinjaShadowNinja
committedMar 27, 2015
Clean up and tweak build system
 * Combine client and server man pages. * Update unit test options and available databases in man page. * Add `--worldname` to man page. * Fix a bunch of places where `"Minetest"` was used directly instead of `PROJECT_NAME`. * Disable server build by default on all operating systems. * Make `ENABLE_FREETYPE` not fail if FreeType isn't found. * Enable LevelDB, Redis, and FreeType detection by default. * Remove the `VERSION_PATCH_ORIG` hack. * Add option to search for and use system JSONCPP. * Remove broken LuaJIT version detection. * Rename `DISABLE_LUAJIT` to `ENABLE_LUAJIT`. * Rename `minetest_*` variables in `version.{h,cpp}` to `g_*`. * Clean up style of CMake files.
·
5.11.00.4.13
1 parent 284fefb commit 93fcab9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+744
-1063
lines changed
 

Diff for: ‎.travis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ compiler:
33
- gcc
44
- clang
55
env:
6-
- WINDOWS=32
7-
- WINDOWS=64
8-
- WINDOWS=no
6+
- PLATFORM=Win32
7+
- PLATFORM=Win64
8+
- PLATFORM=Linux
99
before_install: ./util/travis/before_install.sh
1010
script: ./util/travis/script.sh
1111
notifications:
1212
email: false
1313
matrix:
1414
fast_finish: true
1515
exclude:
16-
- env: WINDOWS=32
16+
- env: PLATFORM=Win32
1717
compiler: clang
18-
- env: WINDOWS=64
18+
- env: PLATFORM=Win64
1919
compiler: clang

Diff for: ‎CMakeLists.txt

+45-42
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,62 @@
11
cmake_minimum_required(VERSION 2.6)
2+
23
if(${CMAKE_VERSION} STREQUAL "2.8.2")
3-
# bug http://vtk.org/Bug/view.php?id=11020
4-
message( WARNING "CMake/CPack version 2.8.2 will not create working .deb packages!")
5-
endif(${CMAKE_VERSION} STREQUAL "2.8.2")
4+
# Bug http://vtk.org/Bug/view.php?id=11020
5+
message(WARNING "CMake/CPack version 2.8.2 will not create working .deb packages!")
6+
endif()
67

78
# This can be read from ${PROJECT_NAME} after project() is called
8-
project(minetest)
9+
project(Minetest)
10+
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
911

10-
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
1112

12-
# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
13+
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
1314
set(VERSION_MAJOR 0)
1415
set(VERSION_MINOR 4)
1516
set(VERSION_PATCH 12)
16-
set(VERSION_PATCH_ORIG ${VERSION_PATCH})
17+
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
1718

19+
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
1820
if(VERSION_EXTRA)
19-
set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
21+
set(VERSION_STRING ${VERSION_STRING}-${VERSION_EXTRA})
2022
else()
2123
# Comment the following line during release
22-
set(VERSION_PATCH ${VERSION_PATCH}-dev)
24+
set(VERSION_STRING "${VERSION_STRING}-dev")
2325
endif()
24-
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
2526

26-
MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
27+
message(STATUS "*** Will build version ${VERSION_STRING} ***")
2728

28-
# Configuration options
2929

30+
# Configuration options
31+
set(DEFAULT_RUN_IN_PLACE FALSE)
3032
if(WIN32)
31-
set(RUN_IN_PLACE 1 CACHE BOOL "Run directly in source directory structure")
32-
else()
33-
set(RUN_IN_PLACE 0 CACHE BOOL "Run directly in source directory structure")
33+
set(DEFAULT_RUN_IN_PLACE TRUE)
3434
endif()
35+
set(RUN_IN_PLACE ${DEFAULT_RUN_IN_PLACE} CACHE BOOL
36+
"Run directly in source directory structure")
3537

36-
# RUN_IN_PLACE is exported as a #define value, ensure it's 1/0 instead of ON/OFF
37-
if(RUN_IN_PLACE)
38-
set(RUN_IN_PLACE 1)
39-
else()
40-
set(RUN_IN_PLACE 0)
41-
endif()
4238

43-
set(BUILD_CLIENT 1 CACHE BOOL "Build client")
44-
if(WIN32 OR APPLE)
45-
set(BUILD_SERVER 0 CACHE BOOL "Build server")
46-
else()
47-
set(BUILD_SERVER 1 CACHE BOOL "Build server")
48-
endif()
39+
set(BUILD_CLIENT TRUE CACHE BOOL "Build client")
40+
set(BUILD_SERVER FALSE CACHE BOOL "Build server")
4941

50-
set(WARN_ALL 1 CACHE BOOL "Enable -Wall for Release build")
42+
43+
set(WARN_ALL TRUE CACHE BOOL "Enable -Wall for Release build")
5144

5245
if(NOT CMAKE_BUILD_TYPE)
5346
# Default to release
5447
set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Debug or Release" FORCE)
5548
endif()
5649

50+
5751
# Included stuff
5852
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
59-
include(${CMAKE_SOURCE_DIR}/cmake/Modules/misc.cmake)
53+
6054

6155
# This is done here so that relative search paths are more reasnable
6256
find_package(Irrlicht)
6357

64-
#
58+
6559
# Installation
66-
#
6760

6861
if(WIN32)
6962
set(SHAREDIR ".")
@@ -72,11 +65,11 @@ if(WIN32)
7265
set(EXAMPLE_CONF_DIR ".")
7366
set(LOCALEDIR "locale")
7467
elseif(APPLE)
75-
set(BUNDLE_NAME ${PROJECT_NAME}.app)
68+
set(BUNDLE_NAME ${PROJECT_NAME_LOWER}.app)
7669
set(BUNDLE_PATH "${BUNDLE_NAME}")
7770
set(BINDIR ${BUNDLE_NAME}/Contents/MacOS)
7871
set(SHAREDIR ${BUNDLE_NAME}/Contents/Resources)
79-
set(DOCDIR "${SHAREDIR}/${PROJECT_NAME}")
72+
set(DOCDIR "${SHAREDIR}/${PROJECT_NAME_LOWER}")
8073
set(EXAMPLE_CONF_DIR ${DOCDIR})
8174
set(LOCALEDIR "${SHAREDIR}/locale")
8275
elseif(UNIX) # Linux, BSD etc
@@ -91,15 +84,15 @@ elseif(UNIX) # Linux, BSD etc
9184
set(ICONDIR "unix/icons")
9285
set(LOCALEDIR "locale")
9386
else()
94-
set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
87+
set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}")
9588
set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
96-
set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}")
89+
set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME_LOWER}")
9790
set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
9891
set(EXAMPLE_CONF_DIR ${DOCDIR})
9992
set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
10093
set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
10194
set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
102-
set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/locale")
95+
set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}/locale")
10396
endif()
10497
endif()
10598

@@ -108,42 +101,50 @@ if(NOT CUSTOM_SHAREDIR STREQUAL "")
108101
set(SHAREDIR "${CUSTOM_SHAREDIR}")
109102
message(STATUS "Using SHAREDIR=${SHAREDIR}")
110103
endif()
104+
111105
set(CUSTOM_BINDIR "" CACHE STRING "Directory to install binaries into")
112106
if(NOT CUSTOM_BINDIR STREQUAL "")
113107
set(BINDIR "${CUSTOM_BINDIR}")
114108
message(STATUS "Using BINDIR=${BINDIR}")
115109
endif()
110+
116111
set(CUSTOM_DOCDIR "" CACHE STRING "Directory to install documentation into")
117112
if(NOT CUSTOM_DOCDIR STREQUAL "")
118113
set(DOCDIR "${CUSTOM_DOCDIR}")
119114
message(STATUS "Using DOCDIR=${DOCDIR}")
120115
endif()
116+
121117
set(CUSTOM_MANDIR "" CACHE STRING "Directory to install manpages into")
122118
if(NOT CUSTOM_MANDIR STREQUAL "")
123119
set(MANDIR "${CUSTOM_MANDIR}")
124120
message(STATUS "Using MANDIR=${MANDIR}")
125121
endif()
122+
126123
set(CUSTOM_EXAMPLE_CONF_DIR "" CACHE STRING "Directory to install example config file into")
127124
if(NOT CUSTOM_EXAMPLE_CONF_DIR STREQUAL "")
128125
set(EXAMPLE_CONF_DIR "${CUSTOM_EXAMPLE_CONF_DIR}")
129126
message(STATUS "Using EXAMPLE_CONF_DIR=${EXAMPLE_CONF_DIR}")
130127
endif()
128+
131129
set(CUSTOM_XDG_APPS_DIR "" CACHE STRING "Directory to install .desktop files into")
132130
if(NOT CUSTOM_XDG_APPS_DIR STREQUAL "")
133131
set(XDG_APPS_DIR "${CUSTOM_XDG_APPS_DIR}")
134132
message(STATUS "Using XDG_APPS_DIR=${XDG_APPS_DIR}")
135133
endif()
134+
136135
set(CUSTOM_ICONDIR "" CACHE STRING "Directory to install icons into")
137136
if(NOT CUSTOM_ICONDIR STREQUAL "")
138137
set(ICONDIR "${CUSTOM_ICONDIR}")
139138
message(STATUS "Using ICONDIR=${ICONDIR}")
140139
endif()
140+
141141
set(CUSTOM_LOCALEDIR "" CACHE STRING "Directory to install l10n files into")
142142
if(NOT CUSTOM_LOCALEDIR STREQUAL "")
143143
set(LOCALEDIR "${CUSTOM_LOCALEDIR}")
144144
message(STATUS "Using LOCALEDIR=${LOCALEDIR}")
145145
endif()
146146

147+
147148
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
148149
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" DESTINATION "${SHAREDIR}")
149150
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games")
@@ -183,13 +184,13 @@ if(APPLE)
183184
install(FILES "misc/Info.plist" DESTINATION "${BUNDLE_PATH}/Contents")
184185
endif()
185186

186-
#
187+
187188
# Subdirectories
188189
# Be sure to add all relevant definitions above this
189-
#
190190

191191
add_subdirectory(src)
192192

193+
193194
# CPack
194195

195196
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An InfiniMiner/Minecraft inspired game")
@@ -202,9 +203,9 @@ set(CPACK_PACKAGE_CONTACT "Perttu Ahola <celeron55@gmail.com>")
202203
if(WIN32)
203204
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
204205
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win64")
205-
else(CMAKE_SIZEOF_VOID_P EQUAL 8)
206+
else()
206207
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32")
207-
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
208+
endif()
208209

209210
set(CPACK_GENERATOR ZIP)
210211
elseif(APPLE)
@@ -219,14 +220,16 @@ endif()
219220

220221
include(CPack)
221222

223+
222224
# Add a target to generate API documentation with Doxygen
223225
find_package(Doxygen)
224226
if(DOXYGEN_FOUND)
225-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile @ONLY)
227+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in
228+
${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile @ONLY)
226229
add_custom_target(doc
227230
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doc/Doxyfile
228231
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc
229232
COMMENT "Generating API documentation with Doxygen" VERBATIM
230233
)
231-
endif(DOXYGEN_FOUND)
234+
endif()
232235

0 commit comments

Comments
 (0)
Please sign in to comment.