summarylogtreecommitdiffstats
path: root/fg-cmake-fixes.patch
blob: 6ab2841a0f41baf236403beebe1fa7279d58aa86 (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
diff --git a/CMakeModules/FindDBus.cmake b/CMakeModules/FindDBus.cmake
index 09753d2..b202b08 100644
--- a/CMakeModules/FindDBus.cmake
+++ b/CMakeModules/FindDBus.cmake
@@ -16,7 +16,7 @@ if(WIN32)
 		)
 	endif()
 else()
-	include(FindPkgConfig)
+	find_package(PkgConfig)
 
 	if(PKG_CONFIG_FOUND)
 		# FIXME : clean this up once we requrie CMake 3.6
@@ -33,5 +33,5 @@ else()
 endif(WIN32)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBUS DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBus DEFAULT_MSG
 	DBUS_INCLUDE_DIRS DBUS_LIBRARIES)
\ No newline at end of file
diff --git a/CMakeModules/FindLibEvent.cmake b/CMakeModules/FindLibEvent.cmake
index a58202d..fe376ed 100644
--- a/CMakeModules/FindLibEvent.cmake
+++ b/CMakeModules/FindLibEvent.cmake
@@ -8,5 +8,5 @@ FIND_PATH(LIBEVENT_INCLUDE_DIR event2/event.h PATH_SUFFIXES include HINTS ${ADDI
 FIND_LIBRARY(LIBEVENT_LIB NAMES event_core PATH_SUFFIXES lib HINTS ${ADDITIONAL_LIBRARY_PATHS})
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBEVENT DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEvent DEFAULT_MSG
 	LIBEVENT_INCLUDE_DIR LIBEVENT_LIB)
\ No newline at end of file
diff --git a/CMakeModules/Translations.cmake b/CMakeModules/Translations.cmake
index 2012b69..05e9105 100644
--- a/CMakeModules/Translations.cmake
+++ b/CMakeModules/Translations.cmake
@@ -35,10 +35,10 @@ function(translation_dir_list result curdir)
   set(${result} ${dirlist} PARENT_SCOPE)
 endfunction()
 
-translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR})
-message(STATUS "Detected language files: ${LANGUAGES}")
-
 if (${do_translate})
+    translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR})
+    message(STATUS "Detected language files: ${LANGUAGES}")
+
     set(translation_res "${PROJECT_BINARY_DIR}/translations.qrc")
 
     add_custom_target(fgfs_qm_files ALL)