blob: 8d73271f6e675891681ce7c9dcfc6be819a34c2b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
--- src/CMakeLists.txt.orig 2011-09-22 21:47:47.000000000 +0400
+++ src/CMakeLists.txt 2011-09-24 18:23:37.000000000 +0400
@@ -11,23 +11,25 @@
# this is only set to 1 if gettext is enabled _and_ available
set(USE_GETTEXT 0)
-find_package(GettextLib)
+if(ENABLE_GETTEXT)
+ find_package(GettextLib)
-if(GETTEXT_FOUND AND ENABLE_GETTEXT)
- message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}")
- message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}")
- if(WIN32)
- message(STATUS "gettext library: ${GETTEXT_LIBRARY}")
- message(STATUS "gettext dll: ${GETTEXT_DLL}")
- message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}")
- endif()
- set(USE_GETTEXT 1)
- message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
-elseif(GETTEXT_FOUND AND NOT ENABLE_GETTEXT)
- MESSAGE(STATUS "GetText found but disabled;")
-else(GETTEXT_FOUND AND ENABLE_GETTEXT)
+ if(GETTEXT_FOUND)
+ message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}")
+ message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}")
+ if(WIN32)
+ message(STATUS "gettext library: ${GETTEXT_LIBRARY}")
+ message(STATUS "gettext dll: ${GETTEXT_DLL}")
+ message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}")
+ endif()
+ set(USE_GETTEXT 1)
+ message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
+ else(GETTEXT_FOUND)
+ message(STATUS "GetText not found, disabling")
+ endif(GETTEXT_FOUND)
+else(ENABLE_GETTEXT)
message(STATUS "GetText disabled")
-endif(GETTEXT_FOUND AND ENABLE_GETTEXT)
+endif(ENABLE_GETTEXT)
if(NOT MSVC)
set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
@@ -74,7 +76,7 @@
endif(APPLE)
endif(BUILD_CLIENT)
find_package(ZLIB REQUIRED)
- set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS})
+ set(PLATFORM_LIBS -pthread ${CMAKE_DL_LIBS})
#set(CLIENT_PLATFORM_LIBS -lXxf86vm)
# This way Xxf86vm is found on OpenBSD too
find_library(XXF86VM_LIBRARY Xxf86vm)
@@ -250,7 +252,7 @@
set(ARCH i386)
endif()
- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
+ set(CMAKE_CXX_FLAGS_RELEASE "${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -Wall")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}")
if(USE_GPROF)
@@ -272,7 +274,6 @@
#
# Example configuration file
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
if(BUILD_CLIENT)
install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
|
